Simplify skips that are no longer version dependent

alcaeus · alcaeus · commit 59d815ecde37 · 2025-05-20T08:53:58.000+02:00
diff --git a/tests/apm/serverHeartbeatFailedEvent-001.phpt b/tests/apm/serverHeartbeatFailedEvent-001.phpt
@@ -3,7 +3,7 @@ MongoDB\Driver\Monitoring\ServerHeartbeatFailedEvent
 --SKIPIF--
 <?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
 <?php skip_if_not_live(); ?>
-<?php skip_if_no_failcommand_failpoint(); ?>
+<?php skip_if_test_commands_disabled(); ?>
 <?php skip_if_not_standalone(); ?>
 <?php skip_if_auth(); ?>
 --FILE--
diff --git a/tests/cursor/bug1419-001.phpt b/tests/cursor/bug1419-001.phpt
@@ -3,7 +3,7 @@ PHPC-1419: error labels from getMore are not exposed
 --SKIPIF--
 <?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
 <?php skip_if_not_libmongoc_crypto(); ?>
-<?php skip_if_no_failcommand_failpoint(); ?>
+<?php skip_if_test_commands_disabled(); ?>
 <?php skip_if_not_clean(); ?>
 --FILE--
 <?php
diff --git a/tests/cursor/cursor-getmore-005.phpt b/tests/cursor/cursor-getmore-005.phpt
@@ -9,7 +9,7 @@ MongoDB\Driver\Cursor query result iteration with getmore failure
 ?>
 <?php skip_if_not_live(); ?>
 <?php skip_if_not_standalone(); ?>
-<?php skip_if_no_getmore_failpoint(); ?>
+<?php skip_if_test_commands_disabled(); ?>
 <?php skip_if_auth(); ?>
 <?php skip_if_no_mongo_orchestration(); ?>
 --FILE--
diff --git a/tests/cursor/cursor-getmore-006.phpt b/tests/cursor/cursor-getmore-006.phpt
@@ -9,7 +9,7 @@ MongoDB\Driver\Cursor command result iteration with getmore failure
 ?>
 <?php skip_if_not_live(); ?>
 <?php skip_if_not_standalone(); ?>
-<?php skip_if_no_getmore_failpoint(); ?>
+<?php skip_if_test_commands_disabled(); ?>
 <?php skip_if_auth(); ?>
 <?php skip_if_no_mongo_orchestration(); ?>
 --FILE--
diff --git a/tests/exception/bulkwriteexception-haserrorlabel-002.phpt b/tests/exception/bulkwriteexception-haserrorlabel-002.phpt
@@ -3,7 +3,7 @@ MongoDB\Driver\Exception\BulkWriteException::hasErrorLabel() with writeConcernEr
 --SKIPIF--
 <?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
 <?php skip_if_not_live(); ?>
-<?php skip_if_no_failcommand_failpoint(); ?>
+<?php skip_if_test_commands_disabled(); ?>
 <?php skip_if_not_clean(); ?>
 --FILE--
 <?php
diff --git a/tests/manager/manager-executeBulkWrite_error-005.phpt b/tests/manager/manager-executeBulkWrite_error-005.phpt
@@ -3,7 +3,7 @@ MongoDB\Driver\Manager::executeBulkWrite() WriteResult accessible for network er
 --SKIPIF--
 <?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
 <?php skip_if_not_live(); ?>
-<?php skip_if_no_failcommand_failpoint(); ?>
+<?php skip_if_test_commands_disabled(); ?>
 <?php skip_if_not_clean(); ?>
 --FILE--
 <?php
diff --git a/tests/retryable-reads/retryable-reads-001.phpt b/tests/retryable-reads/retryable-reads-001.phpt
@@ -3,7 +3,7 @@ Retryable reads: executeReadCommand is retried once
 --SKIPIF--
 <?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
 <?php skip_if_not_libmongoc_crypto(); ?>
-<?php skip_if_no_failcommand_failpoint(); ?>
+<?php skip_if_test_commands_disabled(); ?>
 <?php skip_if_not_clean(); ?>
 --FILE--
 <?php
diff --git a/tests/retryable-reads/retryable-reads-002.phpt b/tests/retryable-reads/retryable-reads-002.phpt
@@ -3,7 +3,7 @@ Retryable reads: executeQuery is retried once
 --SKIPIF--
 <?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
 <?php skip_if_not_libmongoc_crypto(); ?>
-<?php skip_if_no_failcommand_failpoint(); ?>
+<?php skip_if_test_commands_disabled(); ?>
 <?php skip_if_not_clean(); ?>
 --FILE--
 <?php
diff --git a/tests/retryable-reads/retryable-reads_error-001.phpt b/tests/retryable-reads/retryable-reads_error-001.phpt
@@ -3,7 +3,7 @@ Retryable reads: executeReadCommand is not retried when retryable reads are disa
 --SKIPIF--
 <?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
 <?php skip_if_not_libmongoc_crypto(); ?>
-<?php skip_if_no_failcommand_failpoint(); ?>
+<?php skip_if_test_commands_disabled(); ?>
 --FILE--
 <?php
 require_once __DIR__ . "/../utils/basic.inc";
diff --git a/tests/retryable-reads/retryable-reads_error-002.phpt b/tests/retryable-reads/retryable-reads_error-002.phpt
@@ -3,7 +3,7 @@ Retryable reads: executeQuery is not retried when retryable reads are disabled
 --SKIPIF--
 <?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
 <?php skip_if_not_libmongoc_crypto(); ?>
-<?php skip_if_no_failcommand_failpoint(); ?>
+<?php skip_if_test_commands_disabled(); ?>
 --FILE--
 <?php
 require_once __DIR__ . "/../utils/basic.inc";
diff --git a/tests/session/session-isDirty-001.phpt b/tests/session/session-isDirty-001.phpt
@@ -3,7 +3,7 @@ MongoDB\Driver\Session::isDirty()
 --SKIPIF--
 <?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
 <?php skip_if_not_libmongoc_crypto() ?>
-<?php skip_if_no_failcommand_failpoint(); ?>
+<?php skip_if_test_commands_disabled(); ?>
 --FILE--
 <?php
 require_once __DIR__ . "/../utils/basic.inc";
diff --git a/tests/utils/skipif.php b/tests/utils/skipif.php
@@ -436,28 +436,6 @@ function skip_if_not_clean($databaseName = DATABASE_NAME, $collectionName = COLL
     disable_skipif_caching();
 }
 
-function skip_if_no_getmore_failpoint()
-{
-    $serverVersion = get_server_version(URI);
-
-    if (version_compare($serverVersion, '4.0', '<')) {
-        exit("skip Server version '$serverVersion' does not support a getMore failpoint'");
-    }
-}
-
-function skip_if_no_failcommand_failpoint()
-{
-    skip_if_test_commands_disabled();
-
-    $serverVersion = get_server_version(URI);
-
-    if (is_mongos(URI) && version_compare($serverVersion, '4.1.8', '<')) {
-        exit("skip mongos version '$serverVersion' does not support 'failCommand' failpoint'");
-    } elseif (version_compare($serverVersion, '4.0', '<')) {
-        exit("skip mongod version '$serverVersion' does not support 'failCommand' failpoint'");
-    }
-}
-
 function skip_if_no_mongo_orchestration()
 {
     $ctx = stream_context_create(['http' => ['timeout' => 0.5]]);
diff --git a/tests/utils/tools.php b/tests/utils/tools.php
@@ -837,17 +837,12 @@ function failGetMore(Manager $manager)
     $primary = $manager->selectServer(new ReadPreference('primary'));
     $version = get_server_version_from_server($primary);
 
-    if (version_compare($version, "4.0", ">=")) {
-        /* We use 237 here, as that's the same original code that MongoD would
-         * throw if a cursor had already gone by the time we call getMore. This
-         * allows us to make things consistent with the getMore OP behaviour
-         * from previous mongod versions. An errorCode is required here for the
-         * failPoint to work. */
-        configureFailPoint($manager, 'failCommand', 'alwaysOn', [ 'errorCode' => 237, 'failCommands' => ['getMore'] ]);
-        return;
-    }
-
-    throw new Exception("Trying to configure a getMore fail point for a server version ($version) that doesn't support it");
+    /* We use 237 here, as that's the same original code that MongoD would
+     * throw if a cursor had already gone by the time we call getMore. This
+     * allows us to make things consistent with the getMore OP behaviour
+     * from previous mongod versions. An errorCode is required here for the
+     * failPoint to work. */
+    configureFailPoint($manager, 'failCommand', 'alwaysOn', [ 'errorCode' => 237, 'failCommands' => ['getMore'] ]);
 }
 
 function createDBPointer(string $collection = 'phongo.test', string $id = '5a2e78accd485d55b4050000'): DBPointer
diff --git a/tests/writeConcernError/writeconcernerror-getinfo-001.phpt b/tests/writeConcernError/writeconcernerror-getinfo-001.phpt
@@ -6,7 +6,7 @@ https://github.com/mongodb/specifications/blob/master/source/crud/tests/README.r
 --SKIPIF--
 <?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
 <?php skip_if_not_replica_set(); ?>
-<?php skip_if_no_failcommand_failpoint(); ?>
+<?php skip_if_test_commands_disabled(); ?>
 <?php skip_if_not_clean(); ?>
 --FILE--
 <?php
diff --git a/tests/writeResult/writeresult-getErrorReplies-001.phpt b/tests/writeResult/writeresult-getErrorReplies-001.phpt
@@ -4,7 +4,7 @@ MongoDB\Driver\WriteResult::getErrorReplies()
 <?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
 <?php skip_if_not_live(); ?>
 <?php skip_if_not_clean(); ?>
-<?php skip_if_no_failcommand_failpoint(); ?>
+<?php skip_if_test_commands_disabled(); ?>
 --FILE--
 <?php
 require_once __DIR__ . "/../utils/basic.inc";
diff --git a/tests/writeResult/writeresult-getwriteconcernerror-002.phpt b/tests/writeResult/writeresult-getwriteconcernerror-002.phpt
@@ -3,7 +3,7 @@ MongoDB\Driver\WriteResult::getWriteConcernError() works for errors without a me
 --SKIPIF--
 <?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
 <?php skip_if_mongos(); ?>
-<?php skip_if_no_failcommand_failpoint(); ?>
+<?php skip_if_test_commands_disabled(); ?>
 <?php skip_if_not_clean(); ?>
 --FILE--
 <?php
