Merge pull request #663

Author: alcaeus

tests/FunctionalTestCase.php

@@ -138,6 +138,14 @@ protected function assertSameObjectId($expectedObjectId, $actualObjectId)
      */
     protected function configureFailPoint($command)
     {
+        if (! $this->isFailCommandSupported()) {
+            $this->markTestSkipped('failCommand is only supported on mongod >= 4.0.0 and mongos >= 4.1.5.');
+        }
+
+        if (! $this->isFailCommandEnabled()) {
+            $this->markTestSkipped('The enableTestCommands parameter is not enabled.');
+        }
+
         if (is_array($command)) {
             $command = (object) $command;
         }
@@ -394,4 +402,37 @@ private function disableFailPoints()
             $operation->execute($server);
         }
     }
+
+    /**
+     * Checks if the failCommand command is supported on this server version
+     *
+     * @return bool
+     */
+    private function isFailCommandSupported()
+    {
+        $minVersion = $this->isShardedCluster() ? '4.1.5' : '4.0.0';
+
+        return version_compare($this->getServerVersion(), $minVersion, '>=');
+    }
+
+    /**
+     * Checks if the failCommand command is enabled by checking the enableTestCommands parameter
+     *
+     * @return bool
+     */
+    private function isFailCommandEnabled()
+    {
+        try {
+            $cursor = $this->manager->executeCommand(
+                'admin',
+                new Command(['getParameter' => 1, 'enableTestCommands' => 1])
+            );
+
+            $document = current($cursor->toArray());
+        } catch (CommandException $e) {
+            return false;
+        }
+
+        return isset($document->enableTestCommands) && $document->enableTestCommands === true;
+    }
 }

tests/Operation/WatchFunctionalTest.php

@@ -689,10 +689,6 @@ public function testInitialCursorIsNotClosed()
      */
     public function testNonResumableErrorCodes($errorCode)
     {
-        if (version_compare($this->getServerVersion(), '4.0.0', '<')) {
-            $this->markTestSkipped('failCommand is not supported');
-        }
-
         $this->configureFailPoint([
             'configureFailPoint' => 'failCommand',
             'mode' => ['times' => 1],