Skip to content

Commit 2db00e0

Browse files
jmikolajmikola
committed
PHPC-2064: Call skip_if_not_clean after other skip functions
"nocache" output from skip_if_not_clean may cause "skip" output from other functions to be ignored. Changing the order so that skip_if_not_clean is always called last will fix this in most cases (excluding tests that call skip_if_not_clean multiple times).
1 parent 03d8858 commit 2db00e0

20 files changed

+20
-20
lines changed

‎tests/bulk/bulkwrite-debug-002.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ MongoDB\Driver\BulkWrite debug output after execution
33
--SKIPIF--
44
<?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
55
<?php skip_if_not_live(); ?>
6-
<?php skip_if_not_clean(); ?>
76
<?php skip_if_server_version('<', '3.6'); ?>
7+
<?php skip_if_not_clean(); ?>
88
--FILE--
99
<?php
1010
require_once __DIR__ . "/../utils/basic.inc";

‎tests/command/cursor-tailable-001.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ MongoDB\Driver\Command tailable cursor iteration with maxAwaitTimeMS option
33
--SKIPIF--
44
<?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
55
<?php skip_if_not_replica_set(); ?>
6-
<?php skip_if_not_clean(); ?>
76
<?php skip_if_server_version('<', '3.6'); ?>
87
<?php skip_if_not_server_storage_engine('wiredTiger'); ?>
8+
<?php skip_if_not_clean(); ?>
99
--FILE--
1010
<?php
1111
require_once __DIR__ . "/../utils/basic.inc";

‎tests/cursor/bug1050-001.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ PHPC-1050: Command cursor should not invoke getMore at execution
33
--SKIPIF--
44
<?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
55
<?php skip_if_not_replica_set(); ?>
6-
<?php skip_if_not_clean(); ?>
76
<?php skip_if_server_version('<', '3.6'); ?>
87
<?php skip_if_not_server_storage_engine('wiredTiger'); ?>
8+
<?php skip_if_not_clean(); ?>
99
--FILE--
1010
<?php
1111
require_once __DIR__ . "/../utils/basic.inc";

‎tests/cursor/bug1050-002.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ PHPC-1050: Command cursor should not invoke getMore at execution (rewind omitted
44
<?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
55
<?php skip_if_php_version('>', '7.99'); ?>
66
<?php skip_if_not_replica_set(); ?>
7-
<?php skip_if_not_clean(); ?>
87
<?php skip_if_server_version('<', '3.6'); ?>
98
<?php skip_if_not_server_storage_engine('wiredTiger'); ?>
9+
<?php skip_if_not_clean(); ?>
1010
--FILE--
1111
<?php
1212
require_once __DIR__ . "/../utils/basic.inc";

‎tests/cursor/bug1529-001.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ PHPC-1529: Resetting a client should also reset the keyVaultClient
44
<?php if (!function_exists('pcntl_fork')) { die('skip pcntl_fork() not available'); } ?>
55
<?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
66
<?php skip_if_not_live(); ?>
7-
<?php skip_if_not_clean(); ?>
87
<?php skip_if_server_version('<', '4.2'); ?>
98
<?php skip_if_not_libmongocrypt(); ?>
9+
<?php skip_if_not_clean(); ?>
1010
--FILE--
1111
<?php
1212
require_once __DIR__ . "/../utils/basic.inc";

‎tests/cursor/cursor-tailable-003.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ MongoDB\Driver\Cursor tailable iteration with awaitData and maxAwaitTimeMS optio
33
--SKIPIF--
44
<?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
55
<?php skip_if_not_live(); ?>
6-
<?php skip_if_not_clean(); ?>
76
<?php skip_if_server_version('<', '3.2'); ?>
7+
<?php skip_if_not_clean(); ?>
88
--FILE--
99
<?php
1010
require_once __DIR__ . "/../utils/basic.inc";

‎tests/cursor/cursor-tailable_error-002.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ MongoDB\Driver\Cursor cursor killed during tailable iteration
33
--SKIPIF--
44
<?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
55
<?php skip_if_not_live(); ?>
6-
<?php skip_if_not_clean(); ?>
76
<?php skip_if_server_version('<', '3.2'); ?>
7+
<?php skip_if_not_clean(); ?>
88
--FILE--
99
<?php
1010
require_once __DIR__ . "/../utils/basic.inc";

‎tests/cursorid/cursorid-002.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ MongoDB\Driver\CursorId BSON serialization for killCursors command
33
--SKIPIF--
44
<?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
55
<?php skip_if_not_live(); ?>
6-
<?php skip_if_not_clean(); ?>
76
<?php skip_if_server_version('<', '3.2'); ?>
7+
<?php skip_if_not_clean(); ?>
88
--FILE--
99
<?php
1010

‎tests/manager/manager-executeBulkWrite-011.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ MongoDB\Driver\BulkWrite: bypassDocumentValidation option
33
--SKIPIF--
44
<?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
55
<?php skip_if_not_live(); ?>
6-
<?php skip_if_not_clean(); ?>
76
<?php skip_if_server_version('<', '3.2'); ?>
7+
<?php skip_if_not_clean(); ?>
88
--FILE--
99
<?php
1010
require_once __DIR__ . "/../utils/basic.inc";

‎tests/manager/manager-executeCommand-004.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ MongoDB\Driver\Manager::executeCommand() options (MONGOC_CMD_RAW)
55
<?php skip_if_not_live(); ?>
66
<?php skip_if_not_replica_set(); ?>
77
<?php skip_if_no_secondary(); ?>
8-
<?php skip_if_not_clean(); ?>
98
<?php skip_if_server_version('<', '3.6'); ?>
9+
<?php skip_if_not_clean(); ?>
1010
--FILE--
1111
<?php
1212
require_once __DIR__ . "/../utils/basic.inc";

‎tests/manager/manager-executeReadCommand-001.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ MongoDB\Driver\Manager::executeReadCommand()
55
<?php skip_if_not_live(); ?>
66
<?php skip_if_not_replica_set(); ?>
77
<?php skip_if_no_secondary(); ?>
8-
<?php skip_if_not_clean(); ?>
98
<?php skip_if_server_version('<', '3.6'); ?>
109
<?php skip_if_not_server_storage_engine('wiredTiger'); ?>
10+
<?php skip_if_not_clean(); ?>
1111
--FILE--
1212
<?php
1313
require_once __DIR__ . "/../utils/basic.inc";

‎tests/manager/manager-executeReadWriteCommand-001.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ MongoDB\Driver\Manager::executeReadWriteCommand()
33
--SKIPIF--
44
<?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
55
<?php skip_if_not_live(); ?>
6-
<?php skip_if_not_clean(); ?>
76
<?php skip_if_server_version('<', '3.4'); /* aggregate write concern */ ?>
7+
<?php skip_if_not_clean(); ?>
88
--FILE--
99
<?php
1010
require_once __DIR__ . "/../utils/basic.inc";

‎tests/manager/manager-executeWriteCommand-001.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ MongoDB\Driver\Manager::executeWriteCommand()
33
--SKIPIF--
44
<?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
55
<?php skip_if_not_live(); ?>
6-
<?php skip_if_not_clean(); ?>
76
<?php skip_if_server_version('<', '3.6'); ?>
7+
<?php skip_if_not_clean(); ?>
88
--FILE--
99
<?php
1010
require_once __DIR__ . "/../utils/basic.inc";

‎tests/server/server-construct-001.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ MongoDB\Driver\Server::__construct()
33
--SKIPIF--
44
<?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
55
<?php skip_if_not_live(); ?>
6-
<?php skip_if_not_clean(); ?>
76
<?php skip_if_multiple_mongos(); ?>
7+
<?php skip_if_not_clean(); ?>
88
--FILE--
99
<?php
1010
require_once __DIR__ . "/../utils/basic.inc";

‎tests/server/server-executeCommand-006.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ MongoDB\Driver\Server::executeCommand() options (MONGO_CMD_RAW)
44
<?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
55
<?php skip_if_not_live(); ?>
66
<?php skip_if_standalone(); ?>
7-
<?php skip_if_not_clean(); ?>
87
<?php skip_if_server_version('<', '3.6'); ?>
8+
<?php skip_if_not_clean(); ?>
99
--FILE--
1010
<?php
1111
require_once __DIR__ . "/../utils/basic.inc";

‎tests/server/server-executeCommand-008.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ MongoDB\Driver\Server::executeCommand() does not send read preference to standal
44
<?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
55
<?php skip_if_not_live(); ?>
66
<?php skip_if_not_standalone(); ?>
7-
<?php skip_if_not_clean(); ?>
87
<?php skip_if_server_version('<', '3.6'); ?>
8+
<?php skip_if_not_clean(); ?>
99
--FILE--
1010
<?php
1111
require_once __DIR__ . "/../utils/basic.inc";

‎tests/server/server-executeReadCommand-001.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ MongoDB\Driver\Server::executeReadCommand()
55
<?php skip_if_not_live(); ?>
66
<?php skip_if_not_replica_set(); ?>
77
<?php skip_if_no_secondary(); ?>
8-
<?php skip_if_not_clean(); ?>
98
<?php skip_if_server_version('<', '3.6'); ?>
109
<?php skip_if_not_server_storage_engine('wiredTiger'); ?>
10+
<?php skip_if_not_clean(); ?>
1111
--FILE--
1212
<?php
1313
require_once __DIR__ . "/../utils/basic.inc";

‎tests/server/server-executeReadWriteCommand-001.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ MongoDB\Driver\Server::executeReadWriteCommand()
33
--SKIPIF--
44
<?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
55
<?php skip_if_not_live(); ?>
6-
<?php skip_if_not_clean(); ?>
76
<?php skip_if_server_version('<', '3.2'); ?>
7+
<?php skip_if_not_clean(); ?>
88
--FILE--
99
<?php
1010
require_once __DIR__ . "/../utils/basic.inc";

‎tests/server/server-executeWriteCommand-001.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ MongoDB\Driver\Server::executeWriteCommand()
33
--SKIPIF--
44
<?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
55
<?php skip_if_not_live(); ?>
6-
<?php skip_if_not_clean(); ?>
76
<?php skip_if_server_version('<', '3.6'); ?>
7+
<?php skip_if_not_clean(); ?>
88
--FILE--
99
<?php
1010
require_once __DIR__ . "/../utils/basic.inc";

‎tests/writeResult/writeresult-getupsertedids-002.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ MongoDB\Driver\WriteResult::getUpsertedIds() with client-generated values
33
--SKIPIF--
44
<?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
55
<?php skip_if_not_live(); ?>
6-
<?php skip_if_not_clean(); ?>
76
<?php skip_if_server_version('<', '3.0'); ?>
7+
<?php skip_if_not_clean(); ?>
88
--FILE--
99
<?php
1010
require_once __DIR__ . "/../utils/basic.inc";

0 commit comments

Comments
 (0)