PHPC-1290: Run relevant tests on sharded clusters

alcaeus · alcaeus · commit d750c7013cc6 · 2019-08-29T07:26:43.000+02:00
diff --git a/tests/causal-consistency/causal-consistency-001.phpt b/tests/causal-consistency/causal-consistency-001.phpt
@@ -3,7 +3,7 @@ Causal consistency: new session has no operation time
 --SKIPIF--
 <?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
 <?php skip_if_not_libmongoc_crypto(); ?>
-<?php skip_if_not_replica_set(); ?>
+<?php skip_if_not_replica_set_or_mongos_with_replica_set(); ?>
 <?php skip_if_server_version('<', '3.6'); ?>
 --FILE--
 <?php
diff --git a/tests/causal-consistency/causal-consistency-002.phpt b/tests/causal-consistency/causal-consistency-002.phpt
@@ -3,7 +3,7 @@ Causal consistency: first read in session does not include afterClusterTime
 --SKIPIF--
 <?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
 <?php skip_if_not_libmongoc_crypto(); ?>
-<?php skip_if_not_replica_set(); ?>
+<?php skip_if_not_replica_set_or_mongos_with_replica_set(); ?>
 <?php skip_if_server_version('<', '3.6'); ?>
 --FILE--
 <?php
diff --git a/tests/causal-consistency/causal-consistency-003.phpt b/tests/causal-consistency/causal-consistency-003.phpt
@@ -3,7 +3,7 @@ Causal consistency: first read or write in session updates operationTime
 --SKIPIF--
 <?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
 <?php skip_if_not_libmongoc_crypto(); ?>
-<?php skip_if_not_replica_set(); ?>
+<?php skip_if_not_replica_set_or_mongos_with_replica_set(); ?>
 <?php skip_if_server_version('<', '3.6'); ?>
 <?php skip_if_not_clean(); ?>
 --FILE--
diff --git a/tests/causal-consistency/causal-consistency-004.phpt b/tests/causal-consistency/causal-consistency-004.phpt
@@ -3,7 +3,7 @@ Causal consistency: first read or write in session updates operationTime (even o
 --SKIPIF--
 <?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
 <?php skip_if_not_libmongoc_crypto(); ?>
-<?php skip_if_not_replica_set(); ?>
+<?php skip_if_not_replica_set_or_mongos_with_replica_set(); ?>
 <?php skip_if_server_version('<', '3.6'); ?>
 <?php skip_if_not_clean(); ?>
 --FILE--
diff --git a/tests/causal-consistency/causal-consistency-005.phpt b/tests/causal-consistency/causal-consistency-005.phpt
@@ -3,7 +3,7 @@ Causal consistency: second read's afterClusterTime uses last reply's operationTi
 --SKIPIF--
 <?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
 <?php skip_if_not_libmongoc_crypto(); ?>
-<?php skip_if_not_replica_set(); ?>
+<?php skip_if_not_replica_set_or_mongos_with_replica_set(); ?>
 <?php skip_if_server_version('<', '3.6'); ?>
 <?php skip_if_not_clean(); ?>
 --FILE--
diff --git a/tests/causal-consistency/causal-consistency-006.phpt b/tests/causal-consistency/causal-consistency-006.phpt
@@ -3,7 +3,7 @@ Causal consistency: second read's afterClusterTime uses last reply's operationTi
 --SKIPIF--
 <?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
 <?php skip_if_not_libmongoc_crypto(); ?>
-<?php skip_if_not_replica_set(); ?>
+<?php skip_if_not_replica_set_or_mongos_with_replica_set(); ?>
 <?php skip_if_server_version('<', '3.6'); ?>
 <?php skip_if_not_clean(); ?>
 --FILE--
diff --git a/tests/causal-consistency/causal-consistency-007.phpt b/tests/causal-consistency/causal-consistency-007.phpt
@@ -3,7 +3,7 @@ Causal consistency: reads in non-causally consistent session never include after
 --SKIPIF--
 <?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
 <?php skip_if_not_libmongoc_crypto(); ?>
-<?php skip_if_not_replica_set(); ?>
+<?php skip_if_not_replica_set_or_mongos_with_replica_set(); ?>
 <?php skip_if_server_version('<', '3.6'); ?>
 --FILE--
 <?php
diff --git a/tests/causal-consistency/causal-consistency-008.phpt b/tests/causal-consistency/causal-consistency-008.phpt
@@ -3,7 +3,7 @@ Causal consistency: default read concern includes afterClusterTime but not level
 --SKIPIF--
 <?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
 <?php skip_if_not_libmongoc_crypto(); ?>
-<?php skip_if_not_replica_set(); ?>
+<?php skip_if_not_replica_set_or_mongos_with_replica_set(); ?>
 <?php skip_if_server_version('<', '3.6'); ?>
 --FILE--
 <?php
diff --git a/tests/causal-consistency/causal-consistency-009.phpt b/tests/causal-consistency/causal-consistency-009.phpt
@@ -3,7 +3,7 @@ Causal consistency: custom read concern merges afterClusterTime and level
 --SKIPIF--
 <?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
 <?php skip_if_not_libmongoc_crypto(); ?>
-<?php skip_if_not_replica_set(); ?>
+<?php skip_if_not_replica_set_or_mongos_with_replica_set(); ?>
 <?php skip_if_server_version('<', '3.6'); ?>
 --FILE--
 <?php
diff --git a/tests/causal-consistency/causal-consistency-010.phpt b/tests/causal-consistency/causal-consistency-010.phpt
@@ -3,7 +3,7 @@ Causal consistency: unacknowledged write does not update operationTime
 --SKIPIF--
 <?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
 <?php skip_if_not_libmongoc_crypto(); ?>
-<?php skip_if_not_replica_set(); ?>
+<?php skip_if_not_replica_set_or_mongos_with_replica_set(); ?>
 <?php skip_if_server_version('<', '3.6'); ?>
 <?php skip_if_not_clean(); ?>
 --FILE--
diff --git a/tests/causal-consistency/causal-consistency-012.phpt b/tests/causal-consistency/causal-consistency-012.phpt
@@ -3,7 +3,7 @@ Causal consistency: $clusterTime is sent in commands to supported deployments
 --SKIPIF--
 <?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
 <?php skip_if_not_libmongoc_crypto(); ?>
-<?php skip_if_not_replica_set(); ?>
+<?php skip_if_not_replica_set_or_mongos_with_replica_set(); ?>
 <?php skip_if_server_version('<', '3.6'); ?>
 --FILE--
 <?php
diff --git a/tests/manager/manager-executeBulkWrite_error-009.phpt b/tests/manager/manager-executeBulkWrite_error-009.phpt
@@ -2,7 +2,6 @@
 MongoDB\Driver\Manager::executeBulkWrite() with invalid options
 --SKIPIF--
 <?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
-<?php skip_if_not_replica_set(); ?>
 --FILE--
 <?php
 require_once __DIR__ . "/../utils/basic.inc";
diff --git a/tests/manager/manager-executeBulkWrite_error-011.phpt b/tests/manager/manager-executeBulkWrite_error-011.phpt
@@ -3,7 +3,7 @@ MongoDB\Driver\Manager::executeBulkWrite() BulkWriteException inherits labels fr
 --SKIPIF--
 <?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
 <?php skip_if_not_libmongoc_crypto(); ?>
-<?php skip_if_not_replica_set(); ?>
+<?php skip_if_not_replica_set_or_mongos_with_replica_set(); ?>
 <?php skip_if_server_version('<', '4.0'); ?>
 <?php skip_if_no_failcommand_failpoint(); ?>
 <?php skip_if_not_clean(); ?>
diff --git a/tests/manager/manager-executeQuery_error-002.phpt b/tests/manager/manager-executeQuery_error-002.phpt
@@ -2,8 +2,6 @@
 MongoDB\Driver\Manager::executeQuery() with invalid options
 --SKIPIF--
 <?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
-<?php skip_if_not_replica_set(); ?>
-<?php skip_if_not_clean(); ?>
 --FILE--
 <?php
 require_once __DIR__ . "/../utils/basic.inc";
diff --git a/tests/retryable-writes/retryable-writes-001.phpt b/tests/retryable-writes/retryable-writes-001.phpt
@@ -3,7 +3,7 @@ Retryable writes: supported single-statement operations include transaction IDs
 --SKIPIF--
 <?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
 <?php skip_if_not_libmongoc_crypto(); ?>
-<?php skip_if_not_replica_set(); ?>
+<?php skip_if_not_replica_set_or_mongos_with_replica_set(); ?>
 <?php skip_if_server_version('<', '3.6'); ?>
 <?php skip_if_not_clean(); ?>
 --FILE--
diff --git a/tests/retryable-writes/retryable-writes-002.phpt b/tests/retryable-writes/retryable-writes-002.phpt
@@ -3,7 +3,7 @@ Retryable writes: supported multi-statement operations include transaction IDs
 --SKIPIF--
 <?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
 <?php skip_if_not_libmongoc_crypto(); ?>
-<?php skip_if_not_replica_set(); ?>
+<?php skip_if_not_replica_set_or_mongos_with_replica_set(); ?>
 <?php skip_if_server_version('<', '3.6'); ?>
 <?php skip_if_not_clean(); ?>
 --FILE--
diff --git a/tests/retryable-writes/retryable-writes-003.phpt b/tests/retryable-writes/retryable-writes-003.phpt
@@ -3,7 +3,7 @@ Retryable writes: unsupported operations do not include transaction IDs
 --SKIPIF--
 <?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
 <?php skip_if_not_libmongoc_crypto(); ?>
-<?php skip_if_not_replica_set(); ?>
+<?php skip_if_not_replica_set_or_mongos_with_replica_set(); ?>
 <?php skip_if_server_version('<', '3.6'); ?>
 <?php skip_if_not_clean(); ?>
 --FILE--
diff --git a/tests/retryable-writes/retryable-writes-004.phpt b/tests/retryable-writes/retryable-writes-004.phpt
@@ -3,7 +3,7 @@ Retryable writes: unacknowledged write operations do not include transaction IDs
 --SKIPIF--
 <?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
 <?php skip_if_not_libmongoc_crypto(); ?>
-<?php skip_if_not_replica_set(); ?>
+<?php skip_if_not_replica_set_or_mongos_with_replica_set(); ?>
 <?php skip_if_server_version('<', '3.6'); ?>
 <?php skip_if_not_clean(); ?>
 --FILE--
diff --git a/tests/retryable-writes/retryable-writes-005.phpt b/tests/retryable-writes/retryable-writes-005.phpt
@@ -3,7 +3,7 @@ Retryable writes: non-write command methods do not include transaction IDs
 --SKIPIF--
 <?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
 <?php skip_if_not_libmongoc_crypto(); ?>
-<?php skip_if_not_replica_set(); ?>
+<?php skip_if_not_replica_set_or_mongos_with_replica_set(); ?>
 <?php skip_if_server_version('<', '3.6'); ?>
 <?php skip_if_not_clean(); ?>
 --FILE--
diff --git a/tests/retryable-writes/retryable-writes_error-001.phpt b/tests/retryable-writes/retryable-writes_error-001.phpt
@@ -4,7 +4,7 @@ Retryable writes: actionable error message when using retryable writes on unsupp
 <?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
 <?php skip_if_not_libmongoc_crypto(); ?>
 <?php skip_if_not_server_storage_engine('mmapv1'); ?>
-<?php skip_if_not_replica_set(); ?>
+<?php skip_if_not_replica_set_or_mongos_with_replica_set(); ?>
 <?php skip_if_server_version('<', '3.6'); ?>
 <?php skip_if_not_clean(); ?>
 --FILE--
diff --git a/tests/server/server-executeBulkWrite_error-002.phpt b/tests/server/server-executeBulkWrite_error-002.phpt
@@ -2,7 +2,6 @@
 MongoDB\Driver\Server::executeBulkWrite() with invalid options
 --SKIPIF--
 <?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
-<?php skip_if_not_replica_set(); ?>
 --FILE--
 <?php
 require_once __DIR__ . "/../utils/basic.inc";
diff --git a/tests/server/server-executeCommand_error-001.phpt b/tests/server/server-executeCommand_error-001.phpt
@@ -2,7 +2,6 @@
 MongoDB\Driver\Server::executeCommand() with invalid options (MONGOC_CMD_RAW)
 --SKIPIF--
 <?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
-<?php skip_if_not_replica_set(); ?>
 <?php skip_if_not_clean(); ?>
 --FILE--
 <?php
diff --git a/tests/server/server-executeQuery_error-001.phpt b/tests/server/server-executeQuery_error-001.phpt
@@ -2,8 +2,6 @@
 MongoDB\Driver\Server::executeQuery() with invalid options
 --SKIPIF--
 <?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
-<?php skip_if_not_replica_set(); ?>
-<?php skip_if_not_clean(); ?>
 --FILE--
 <?php
 require_once __DIR__ . "/../utils/basic.inc";
diff --git a/tests/session/session-002.phpt b/tests/session/session-002.phpt
@@ -3,7 +3,7 @@ MongoDB\Driver\Session spec test: $clusterTime in commands
 --SKIPIF--
 <?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
 <?php skip_if_not_libmongoc_crypto(); ?>
-<?php skip_if_not_replica_set(); ?>
+<?php skip_if_not_replica_set_or_mongos_with_replica_set(); ?>
 <?php skip_if_server_version('<', '3.6'); ?>
 <?php skip_if_not_clean(); ?>
 --FILE--
diff --git a/tests/session/session-advanceClusterTime-001.phpt b/tests/session/session-advanceClusterTime-001.phpt
@@ -3,7 +3,7 @@ MongoDB\Driver\Session::advanceClusterTime()
 --SKIPIF--
 <?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
 <?php skip_if_not_libmongoc_crypto(); ?>
-<?php skip_if_not_replica_set(); ?>
+<?php skip_if_not_replica_set_or_mongos_with_replica_set(); ?>
 <?php skip_if_server_version('<', '3.6'); ?>
 --FILE--
 <?php
diff --git a/tests/session/session-advanceOperationTime-001.phpt b/tests/session/session-advanceOperationTime-001.phpt
@@ -3,7 +3,7 @@ MongoDB\Driver\Session::advanceOperationTime()
 --SKIPIF--
 <?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
 <?php skip_if_not_libmongoc_crypto(); ?>
-<?php skip_if_not_replica_set(); ?>
+<?php skip_if_not_replica_set_or_mongos_with_replica_set(); ?>
 <?php skip_if_server_version('<', '3.6'); ?>
 --FILE--
 <?php
diff --git a/tests/session/session-advanceOperationTime-002.phpt b/tests/session/session-advanceOperationTime-002.phpt
@@ -3,7 +3,7 @@ MongoDB\Driver\Session::advanceOperationTime() with Timestamp
 --SKIPIF--
 <?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
 <?php skip_if_not_libmongoc_crypto(); ?>
-<?php skip_if_not_replica_set(); ?>
+<?php skip_if_not_replica_set_or_mongos_with_replica_set(); ?>
 <?php skip_if_server_version('<', '3.6'); ?>
 --FILE--
 <?php
diff --git a/tests/session/session-advanceOperationTime-003.phpt b/tests/session/session-advanceOperationTime-003.phpt
@@ -3,7 +3,7 @@ MongoDB\Driver\Session::advanceOperationTime() with TimestampInterface
 --SKIPIF--
 <?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
 <?php skip_if_not_libmongoc_crypto(); ?>
-<?php skip_if_not_replica_set(); ?>
+<?php skip_if_not_replica_set_or_mongos_with_replica_set(); ?>
 <?php skip_if_server_version('<', '3.6'); ?>
 --FILE--
 <?php
diff --git a/tests/session/session-advanceOperationTime_error-001.phpt b/tests/session/session-advanceOperationTime_error-001.phpt
@@ -3,7 +3,7 @@ MongoDB\Driver\Session::advanceOperationTime() with TimestampInterface exception
 --SKIPIF--
 <?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
 <?php skip_if_not_libmongoc_crypto(); ?>
-<?php skip_if_not_replica_set(); ?>
+<?php skip_if_not_replica_set_or_mongos_with_replica_set(); ?>
 <?php skip_if_server_version('<', '3.6'); ?>
 --FILE--
 <?php
diff --git a/tests/session/session-commitTransaction-001.phpt b/tests/session/session-commitTransaction-001.phpt
@@ -3,7 +3,7 @@ MongoDB\Driver\Session::commitTransaction() applies w:majority when retrying
 --SKIPIF--
 <?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
 <?php skip_if_not_libmongoc_crypto() ?>
-<?php skip_if_not_replica_set(); ?>
+<?php skip_if_not_replica_set_or_mongos_with_replica_set(); ?>
 <?php skip_if_server_version('<', '4.0'); ?>
 <?php skip_if_not_clean(); ?>
 --FILE--
diff --git a/tests/session/session-debug-002.phpt b/tests/session/session-debug-002.phpt
@@ -3,7 +3,7 @@ MongoDB\Driver\Session debug output (after an operation)
 --SKIPIF--
 <?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
 <?php skip_if_not_libmongoc_crypto(); ?>
-<?php skip_if_not_replica_set(); ?>
+<?php skip_if_not_replica_set_or_mongos_with_replica_set(); ?>
 <?php skip_if_server_version('<', '3.6'); ?>
 --FILE--
 <?php
diff --git a/tests/session/session-endSession-001.phpt b/tests/session/session-endSession-001.phpt
@@ -3,7 +3,7 @@ MongoDB\Driver\Session::endSession() Calling methods after session has been ende
 --SKIPIF--
 <?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
 <?php skip_if_not_libmongoc_crypto(); ?>
-<?php skip_if_not_replica_set(); ?>
+<?php skip_if_not_replica_set_or_mongos_with_replica_set(); ?>
 <?php skip_if_server_version('<', '4.0'); ?>
 --FILE--
 <?php
diff --git a/tests/session/session-getClusterTime-001.phpt b/tests/session/session-getClusterTime-001.phpt
@@ -3,7 +3,7 @@ MongoDB\Driver\Session::getClusterTime()
 --SKIPIF--
 <?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
 <?php skip_if_not_libmongoc_crypto(); ?>
-<?php skip_if_not_replica_set(); ?>
+<?php skip_if_not_replica_set_or_mongos_with_replica_set(); ?>
 <?php skip_if_server_version('<', '3.6'); ?>
 --FILE--
 <?php
diff --git a/tests/session/session-getOperationTime-001.phpt b/tests/session/session-getOperationTime-001.phpt
@@ -3,7 +3,7 @@ MongoDB\Driver\Session::getOperationTime()
 --SKIPIF--
 <?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
 <?php skip_if_not_libmongoc_crypto(); ?>
-<?php skip_if_not_replica_set(); ?>
+<?php skip_if_not_replica_set_or_mongos_with_replica_set(); ?>
 <?php skip_if_server_version('<', '3.6'); ?>
 --FILE--
 <?php
diff --git a/tests/session/session-isInTransaction-001.phpt b/tests/session/session-isInTransaction-001.phpt
@@ -3,7 +3,7 @@ MongoDB\Driver\Session::isInTransaction()
 --SKIPIF--
 <?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
 <?php skip_if_not_libmongoc_crypto() ?>
-<?php skip_if_not_replica_set(); ?>
+<?php skip_if_not_replica_set_or_mongos_with_replica_set(); ?>
 <?php skip_if_server_version('<', '4.0'); ?>
 <?php skip_if_not_clean(); ?>
 --FILE--
diff --git a/tests/session/session-startTransaction-001.phpt b/tests/session/session-startTransaction-001.phpt
@@ -3,7 +3,7 @@ MongoDB\Driver\Session::startTransaction() ensure that methods can be called
 --SKIPIF--
 <?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
 <?php skip_if_not_libmongoc_crypto() ?>
-<?php skip_if_not_replica_set(); ?>
+<?php skip_if_not_replica_set_or_mongos_with_replica_set(); ?>
 <?php skip_if_server_version('<', '4.0'); ?>
 --FILE--
 <?php
diff --git a/tests/session/session-startTransaction_error-001.phpt b/tests/session/session-startTransaction_error-001.phpt
@@ -3,7 +3,7 @@ MongoDB\Driver\Session::startTransaction() twice
 --SKIPIF--
 <?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
 <?php skip_if_not_libmongoc_crypto() ?>
-<?php skip_if_not_replica_set(); ?>
+<?php skip_if_not_replica_set_or_mongos_with_replica_set(); ?>
 <?php skip_if_server_version('<', '4.0'); ?>
 --FILE--
 <?php
diff --git a/tests/session/session-startTransaction_error-002.phpt b/tests/session/session-startTransaction_error-002.phpt
@@ -3,7 +3,7 @@ MongoDB\Driver\Session::startTransaction() with wrong values in options array
 --SKIPIF--
 <?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
 <?php skip_if_not_libmongoc_crypto() ?>
-<?php skip_if_not_replica_set(); ?>
+<?php skip_if_not_replica_set_or_mongos_with_replica_set(); ?>
 <?php skip_if_server_version('<', '4.0'); ?>
 --FILE--
 <?php
diff --git a/tests/session/session-startTransaction_error-003.phpt b/tests/session/session-startTransaction_error-003.phpt
@@ -3,7 +3,7 @@ MongoDB\Driver\Session::startTransaction() with wrong argument for options array
 --SKIPIF--
 <?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
 <?php skip_if_not_libmongoc_crypto() ?>
-<?php skip_if_not_replica_set(); ?>
+<?php skip_if_not_replica_set_or_mongos_with_replica_set(); ?>
 <?php skip_if_server_version('<', '4.0'); ?>
 --FILE--
 <?php
diff --git a/tests/session/transaction-integration-001.phpt b/tests/session/transaction-integration-001.phpt
@@ -3,7 +3,7 @@ MongoDB\Driver\Session::startTransaction() Committing a transaction with example
 --SKIPIF--
 <?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
 <?php skip_if_not_libmongoc_crypto(); ?>
-<?php skip_if_not_replica_set(); ?>
+<?php skip_if_not_replica_set_or_mongos_with_replica_set(); ?>
 <?php skip_if_server_version('<', '4.0'); ?>
 <?php skip_if_not_clean(DATABASE_NAME, COLLECTION_NAME . '_employees'); ?>
 <?php skip_if_not_clean(DATABASE_NAME, COLLECTION_NAME . '_events'); ?>
diff --git a/tests/session/transaction-integration-002.phpt b/tests/session/transaction-integration-002.phpt
@@ -3,7 +3,7 @@ MongoDB\Driver\Session::startTransaction() Transient Error Test
 --SKIPIF--
 <?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
 <?php skip_if_not_libmongoc_crypto(); ?>
-<?php skip_if_not_replica_set(); ?>
+<?php skip_if_not_replica_set_or_mongos_with_replica_set(); ?>
 <?php skip_if_server_version('<', '4.0'); ?>
 <?php skip_if_not_clean(); ?>
 --FILE--
diff --git a/tests/session/transaction-integration-003.phpt b/tests/session/transaction-integration-003.phpt
@@ -3,7 +3,7 @@ MongoDB\Driver\Session::startTransaction() Transient Error Test
 --SKIPIF--
 <?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
 <?php skip_if_not_libmongoc_crypto(); ?>
-<?php skip_if_not_replica_set(); ?>
+<?php skip_if_not_replica_set_or_mongos_with_replica_set(); ?>
 <?php skip_if_server_version('<', '4.0'); ?>
 <?php skip_if_not_clean(); ?>
 --FILE--
diff --git a/tests/session/transaction-integration_error-001.phpt b/tests/session/transaction-integration_error-001.phpt
@@ -3,7 +3,7 @@ MongoDB\Driver\Session: Setting per-op readConcern or writeConcern in transactio
 --SKIPIF--
 <?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
 <?php skip_if_not_libmongoc_crypto(); ?>
-<?php skip_if_not_replica_set(); ?>
+<?php skip_if_not_replica_set_or_mongos_with_replica_set(); ?>
 <?php skip_if_server_version('<', '4.0'); ?>
 <?php skip_if_not_clean(); ?>
 --FILE--
diff --git a/tests/session/transaction-integration_error-002.phpt b/tests/session/transaction-integration_error-002.phpt
@@ -3,7 +3,7 @@ MongoDB\Driver\Session: Setting per-op readConcern in transaction (executeReadCo
 --SKIPIF--
 <?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
 <?php skip_if_not_libmongoc_crypto(); ?>
-<?php skip_if_not_replica_set(); ?>
+<?php skip_if_not_replica_set_or_mongos_with_replica_set(); ?>
 <?php skip_if_server_version('<', '4.0'); ?>
 <?php skip_if_not_clean(); ?>
 --FILE--
diff --git a/tests/session/transaction-integration_error-003.phpt b/tests/session/transaction-integration_error-003.phpt
diff --git a/tests/session/transaction-integration_error-004.phpt b/tests/session/transaction-integration_error-004.phpt
diff --git a/tests/utils/skipif.php b/tests/utils/skipif.php
