PHPC-1249: Fix tests running against MongoDB 3.0 replicaset

derickr · derickr · commit e272bb5e47ac · 2018-07-20T16:39:37.000+01:00
diff --git a/tests/causal-consistency/causal-consistency-001.phpt b/tests/causal-consistency/causal-consistency-001.phpt
@@ -4,6 +4,7 @@ Causal consistency: new session has no operation time
 <?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
 <?php skip_if_not_libmongoc_crypto(); ?>
 <?php skip_if_not_replica_set(); ?>
+<?php skip_if_server_version('<', '3.6'); ?>
 --FILE--
 <?php
 require_once __DIR__ . "/../utils/basic.inc";
diff --git a/tests/causal-consistency/causal-consistency-002.phpt b/tests/causal-consistency/causal-consistency-002.phpt
@@ -4,6 +4,7 @@ Causal consistency: first read in session does not include afterClusterTime
 <?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
 <?php skip_if_not_libmongoc_crypto(); ?>
 <?php skip_if_not_replica_set(); ?>
+<?php skip_if_server_version('<', '3.6'); ?>
 --FILE--
 <?php
 require_once __DIR__ . "/../utils/basic.inc";
diff --git a/tests/causal-consistency/causal-consistency-003.phpt b/tests/causal-consistency/causal-consistency-003.phpt
@@ -4,6 +4,7 @@ Causal consistency: first read or write in session updates operationTime
 <?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
 <?php skip_if_not_libmongoc_crypto(); ?>
 <?php skip_if_not_replica_set(); ?>
+<?php skip_if_server_version('<', '3.6'); ?>
 <?php skip_if_not_clean(); ?>
 --FILE--
 <?php
diff --git a/tests/causal-consistency/causal-consistency-004.phpt b/tests/causal-consistency/causal-consistency-004.phpt
@@ -4,6 +4,7 @@ Causal consistency: first read or write in session updates operationTime (even o
 <?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
 <?php skip_if_not_libmongoc_crypto(); ?>
 <?php skip_if_not_replica_set(); ?>
+<?php skip_if_server_version('<', '3.6'); ?>
 <?php skip_if_not_clean(); ?>
 --FILE--
 <?php
diff --git a/tests/causal-consistency/causal-consistency-005.phpt b/tests/causal-consistency/causal-consistency-005.phpt
@@ -4,6 +4,7 @@ Causal consistency: second read's afterClusterTime uses last reply's operationTi
 <?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
 <?php skip_if_not_libmongoc_crypto(); ?>
 <?php skip_if_not_replica_set(); ?>
+<?php skip_if_server_version('<', '3.6'); ?>
 <?php skip_if_not_clean(); ?>
 --FILE--
 <?php
diff --git a/tests/causal-consistency/causal-consistency-006.phpt b/tests/causal-consistency/causal-consistency-006.phpt
@@ -4,6 +4,7 @@ Causal consistency: second read's afterClusterTime uses last reply's operationTi
 <?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
 <?php skip_if_not_libmongoc_crypto(); ?>
 <?php skip_if_not_replica_set(); ?>
+<?php skip_if_server_version('<', '3.6'); ?>
 <?php skip_if_not_clean(); ?>
 --FILE--
 <?php
diff --git a/tests/causal-consistency/causal-consistency-007.phpt b/tests/causal-consistency/causal-consistency-007.phpt
@@ -4,6 +4,7 @@ Causal consistency: reads in non-causally consistent session never include after
 <?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
 <?php skip_if_not_libmongoc_crypto(); ?>
 <?php skip_if_not_replica_set(); ?>
+<?php skip_if_server_version('<', '3.6'); ?>
 --FILE--
 <?php
 require_once __DIR__ . "/../utils/basic.inc";
diff --git a/tests/causal-consistency/causal-consistency-008.phpt b/tests/causal-consistency/causal-consistency-008.phpt
@@ -4,6 +4,7 @@ Causal consistency: default read concern includes afterClusterTime but not level
 <?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
 <?php skip_if_not_libmongoc_crypto(); ?>
 <?php skip_if_not_replica_set(); ?>
+<?php skip_if_server_version('<', '3.6'); ?>
 --FILE--
 <?php
 require_once __DIR__ . "/../utils/basic.inc";
diff --git a/tests/causal-consistency/causal-consistency-009.phpt b/tests/causal-consistency/causal-consistency-009.phpt
@@ -4,6 +4,7 @@ Causal consistency: custom read concern merges afterClusterTime and level
 <?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
 <?php skip_if_not_libmongoc_crypto(); ?>
 <?php skip_if_not_replica_set(); ?>
+<?php skip_if_server_version('<', '3.6'); ?>
 --FILE--
 <?php
 require_once __DIR__ . "/../utils/basic.inc";
diff --git a/tests/causal-consistency/causal-consistency-010.phpt b/tests/causal-consistency/causal-consistency-010.phpt
@@ -4,6 +4,7 @@ Causal consistency: unacknowledged write does not update operationTime
 <?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
 <?php skip_if_not_libmongoc_crypto(); ?>
 <?php skip_if_not_replica_set(); ?>
+<?php skip_if_server_version('<', '3.6'); ?>
 <?php skip_if_not_clean(); ?>
 --FILE--
 <?php
diff --git a/tests/causal-consistency/causal-consistency-012.phpt b/tests/causal-consistency/causal-consistency-012.phpt
@@ -4,6 +4,7 @@ Causal consistency: $clusterTime is sent in commands to supported deployments
 <?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
 <?php skip_if_not_libmongoc_crypto(); ?>
 <?php skip_if_not_replica_set(); ?>
+<?php skip_if_server_version('<', '3.6'); ?>
 --FILE--
 <?php
 require_once __DIR__ . "/../utils/basic.inc";
diff --git a/tests/manager/manager-executeWriteCommand_error-002.phpt b/tests/manager/manager-executeWriteCommand_error-002.phpt
@@ -3,6 +3,7 @@ MongoDB\Driver\Manager::executeWriteCommand() throws CommandException for invali
 --SKIPIF--
 <?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
 <?php skip_if_not_replica_set(); ?>
+<?php skip_if_server_version('<', '3.2'); ?>
 <?php skip_if_not_clean(); ?>
 --FILE--
 <?php
diff --git a/tests/query/bug0705-002.phpt b/tests/query/bug0705-002.phpt
@@ -3,6 +3,7 @@ PHPC-705: Do not unnecessarily wrap filters in $query (currentOp query)
 --SKIPIF--
 <?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
 <?php skip_if_not_live(); ?>
+<?php skip_if_not_standalone(); ?>
 <?php skip_if_server_version('>=', '3.1'); ?>
 <?php skip_if_not_clean(); ?>
 --FILE--
diff --git a/tests/replicaset/bug0898-001.phpt b/tests/replicaset/bug0898-001.phpt
@@ -3,6 +3,7 @@ PHPC-898: readConcern option should not be included in getMore commands (URI opt
 --SKIPIF--
 <?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
 <?php skip_if_not_replica_set(); ?>
+<?php skip_if_server_version('<', '3.2'); ?>
 <?php skip_if_not_clean(); ?>
 --FILE--
 <?php
diff --git a/tests/replicaset/bug0898-002.phpt b/tests/replicaset/bug0898-002.phpt
@@ -3,6 +3,7 @@ PHPC-898: readConcern option should not be included in getMore commands (query o
 --SKIPIF--
 <?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
 <?php skip_if_not_replica_set(); ?>
+<?php skip_if_server_version('<', '3.2'); ?>
 <?php skip_if_not_clean(); ?>
 --FILE--
 <?php
diff --git a/tests/replicaset/manager-getservers-001.phpt b/tests/replicaset/manager-getservers-001.phpt
@@ -31,7 +31,7 @@ array(3) {
     ["host"]=>
     string(%d) "%s"
     ["port"]=>
-    int(3000)
+    int(%d)
     ["type"]=>
     int(4)
     ["is_primary"]=>
@@ -63,7 +63,7 @@ array(3) {
     ["host"]=>
     string(%d) "%s"
     ["port"]=>
-    int(3001)
+    int(%d)
     ["type"]=>
     int(5)
     ["is_primary"]=>
@@ -95,7 +95,7 @@ array(3) {
     ["host"]=>
     string(%d) "%s"
     ["port"]=>
-    int(3002)
+    int(%d)
     ["type"]=>
     int(6)
     ["is_primary"]=>
@@ -116,7 +116,7 @@ array(3) {
     int(%d)
   }
 }
-%s:3000 - primary: 1, secondary: 0, arbiter: 0
-%s:3001 - primary: 0, secondary: 1, arbiter: 0
-%s:3002 - primary: 0, secondary: 0, arbiter: 1
+%s:%d - primary: 1, secondary: 0, arbiter: 0
+%s:%d - primary: 0, secondary: 1, arbiter: 0
+%s:%d - primary: 0, secondary: 0, arbiter: 1
 ===DONE===
diff --git a/tests/replicaset/readconcern-001.phpt b/tests/replicaset/readconcern-001.phpt
@@ -3,6 +3,7 @@ ReadConcern: MongoDB\Driver\Manager::executeQuery() with readConcern option (fin
 --SKIPIF--
 <?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
 <?php skip_if_not_replica_set(); ?>
+<?php skip_if_server_version('<', '3.2'); ?>
 <?php skip_if_not_clean(); ?>
 --FILE--
 <?php
diff --git a/tests/replicaset/server-001.phpt b/tests/replicaset/server-001.phpt
@@ -48,19 +48,19 @@ array(2) {
   string(3) "one"
 }
 int(%d)
-int(3000)
+int(%d)
 bool(true)
 bool(true)
 bool(false)
 bool(false)
 bool(false)
 bool(false)
-string(10) "REPLICASET"
+string(%d) "REPLICASET%S"
 array(2) {
   [0]=>
-  string(%d) "%s:3000"
+  string(%d) "%s:%d"
   [1]=>
-  string(%d) "%s:3001"
+  string(%d) "%s:%d"
 }
 bool(true)
 ===DONE===
diff --git a/tests/replicaset/server-002.phpt b/tests/replicaset/server-002.phpt
@@ -43,19 +43,19 @@ array(2) {
   string(3) "two"
 }
 int(%d)
-int(3001)
+int(%d)
 bool(true)
 bool(false)
 bool(true)
 bool(false)
 bool(false)
 bool(false)
-string(10) "REPLICASET"
+string(%s) "REPLICASET%S"
 array(2) {
   [0]=>
-  string(%d) "%s:3000"
+  string(%d) "%s:%d"
   [1]=>
-  string(%d) "%s:3001"
+  string(%d) "%s:%d"
 }
 bool(true)
 ===DONE===
diff --git a/tests/replicaset/writeresult-getserver-001.phpt b/tests/replicaset/writeresult-getserver-001.phpt
@@ -39,6 +39,6 @@ var_dump($server->getPort(), $server3->getPort());
 --EXPECTF--
 bool(true)
 bool(false)
-int(3000)
-int(3001)
+int(%d)
+int(%d)
 ===DONE===
diff --git a/tests/replicaset/writeresult-getserver-002.phpt b/tests/replicaset/writeresult-getserver-002.phpt
@@ -55,8 +55,8 @@ $server3->executeCommand("local", $cmd);
 --EXPECTF--
 bool(true)
 bool(false)
-int(3000)
-int(3001)
+int(%d)
+int(%d)
 object(MongoDB\Driver\WriteResult)#%d (%d) {
   ["nInserted"]=>
   int(1)
@@ -81,7 +81,7 @@ object(MongoDB\Driver\WriteResult)#%d (%d) {
   }
 }
 string(%d) "%s"
-int(3001)
+int(%d)
 object(stdClass)#%d (2) {
   ["_id"]=>
   object(%s\ObjectId)#%d (1) {
diff --git a/tests/retryable-writes/retryable-writes-001.phpt b/tests/retryable-writes/retryable-writes-001.phpt
@@ -4,6 +4,7 @@ Retryable writes: supported single-statement operations include transaction IDs
 <?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
 <?php skip_if_not_libmongoc_crypto(); ?>
 <?php skip_if_not_replica_set(); ?>
+<?php skip_if_server_version('<', '3.6'); ?>
 <?php skip_if_not_clean(); ?>
 --FILE--
 <?php
@@ -81,4 +82,4 @@ update command includes transaction ID: yes
 
 Testing findAndModify
 findAndModify command includes transaction ID: yes
-===DONE===
+===DONE===
diff --git a/tests/retryable-writes/retryable-writes-002.phpt b/tests/retryable-writes/retryable-writes-002.phpt
@@ -4,6 +4,7 @@ Retryable writes: supported multi-statement operations include transaction IDs
 <?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
 <?php skip_if_not_libmongoc_crypto(); ?>
 <?php skip_if_not_replica_set(); ?>
+<?php skip_if_server_version('<', '3.6'); ?>
 <?php skip_if_not_clean(); ?>
 --FILE--
 <?php
@@ -82,4 +83,4 @@ insert command includes transaction ID: yes
 
 Testing insertMany (ordered=false)
 insert command includes transaction ID: yes
-===DONE===
+===DONE===
diff --git a/tests/retryable-writes/retryable-writes-003.phpt b/tests/retryable-writes/retryable-writes-003.phpt
@@ -4,6 +4,7 @@ Retryable writes: unsupported operations do not include transaction IDs
 <?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
 <?php skip_if_not_libmongoc_crypto(); ?>
 <?php skip_if_not_replica_set(); ?>
+<?php skip_if_server_version('<', '3.6'); ?>
 <?php skip_if_not_clean(); ?>
 --FILE--
 <?php
@@ -96,4 +97,4 @@ update command includes transaction ID: no
 
 Testing aggregate
 aggregate command includes transaction ID: no
-===DONE===
+===DONE===
diff --git a/tests/retryable-writes/retryable-writes-004.phpt b/tests/retryable-writes/retryable-writes-004.phpt
@@ -6,6 +6,7 @@ Depends on CDRIVER-2432
 <?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
 <?php skip_if_not_libmongoc_crypto(); ?>
 <?php skip_if_not_replica_set(); ?>
+<?php skip_if_server_version('<', '3.6'); ?>
 <?php skip_if_not_clean(); ?>
 --FILE--
 <?php
diff --git a/tests/retryable-writes/retryable-writes-005.phpt b/tests/retryable-writes/retryable-writes-005.phpt
@@ -4,6 +4,7 @@ Retryable writes: non-write command methods do not include transaction IDs
 <?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
 <?php skip_if_not_libmongoc_crypto(); ?>
 <?php skip_if_not_replica_set(); ?>
+<?php skip_if_server_version('<', '3.6'); ?>
 <?php skip_if_not_clean(); ?>
 --FILE--
 <?php
@@ -67,4 +68,4 @@ findAndModify command includes transaction ID: yes
 
 Testing Manager::executeWriteCommand()
 findAndModify command includes transaction ID: yes
-===DONE===
+===DONE===
diff --git a/tests/server/server-executeCommand-002.phpt b/tests/server/server-executeCommand-002.phpt
@@ -3,6 +3,7 @@ MongoDB\Driver\Server::executeCommand() takes a read preference
 --SKIPIF--
 <?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
 <?php skip_if_not_replica_set(); ?>
+<?php skip_if_server_version('<', '3.2'); ?>
 <?php skip_if_not_clean(DATABASE_NAME, 'system.profile'); ?>
 --FILE--
 <?php
diff --git a/tests/server/server-executeQuery-006.phpt b/tests/server/server-executeQuery-006.phpt
@@ -3,6 +3,7 @@ MongoDB\Driver\Server::executeQuery() takes a read preference (find command)
 --SKIPIF--
 <?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
 <?php skip_if_not_replica_set(); ?>
+<?php skip_if_server_version('<', '3.2'); ?>
 <?php skip_if_not_clean(DATABASE_NAME, 'system.profile'); ?>
 --FILE--
 <?php
diff --git a/tests/session/session-002.phpt b/tests/session/session-002.phpt
@@ -4,6 +4,7 @@ MongoDB\Driver\Session spec test: $clusterTime in commands
 <?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
 <?php skip_if_not_libmongoc_crypto(); ?>
 <?php skip_if_not_replica_set(); ?>
+<?php skip_if_server_version('<', '3.6'); ?>
 <?php skip_if_not_clean(); ?>
 --FILE--
 <?php
diff --git a/tests/session/session-advanceClusterTime-001.phpt b/tests/session/session-advanceClusterTime-001.phpt
@@ -4,6 +4,7 @@ MongoDB\Driver\Session::advanceClusterTime()
 <?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
 <?php skip_if_not_libmongoc_crypto(); ?>
 <?php skip_if_not_replica_set(); ?>
+<?php skip_if_server_version('<', '3.6'); ?>
 --FILE--
 <?php
 require_once __DIR__ . "/../utils/basic.inc";
diff --git a/tests/session/session-advanceOperationTime-001.phpt b/tests/session/session-advanceOperationTime-001.phpt
@@ -4,6 +4,7 @@ MongoDB\Driver\Session::advanceOperationTime()
 <?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
 <?php skip_if_not_libmongoc_crypto(); ?>
 <?php skip_if_not_replica_set(); ?>
+<?php skip_if_server_version('<', '3.6'); ?>
 --FILE--
 <?php
 require_once __DIR__ . "/../utils/basic.inc";
diff --git a/tests/session/session-advanceOperationTime-002.phpt b/tests/session/session-advanceOperationTime-002.phpt
@@ -4,6 +4,7 @@ MongoDB\Driver\Session::advanceOperationTime() with Timestamp
 <?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
 <?php skip_if_not_libmongoc_crypto(); ?>
 <?php skip_if_not_replica_set(); ?>
+<?php skip_if_server_version('<', '3.6'); ?>
 --FILE--
 <?php
 require_once __DIR__ . "/../utils/basic.inc";
diff --git a/tests/session/session-advanceOperationTime-003.phpt b/tests/session/session-advanceOperationTime-003.phpt
@@ -4,6 +4,7 @@ MongoDB\Driver\Session::advanceOperationTime() with TimestampInterface
 <?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
 <?php skip_if_not_libmongoc_crypto(); ?>
 <?php skip_if_not_replica_set(); ?>
+<?php skip_if_server_version('<', '3.6'); ?>
 --FILE--
 <?php
 require_once __DIR__ . "/../utils/basic.inc";
diff --git a/tests/session/session-advanceOperationTime_error-001.phpt b/tests/session/session-advanceOperationTime_error-001.phpt
@@ -4,6 +4,7 @@ MongoDB\Driver\Session::advanceOperationTime() with TimestampInterface exception
 <?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
 <?php skip_if_not_libmongoc_crypto(); ?>
 <?php skip_if_not_replica_set(); ?>
+<?php skip_if_server_version('<', '3.6'); ?>
 --FILE--
 <?php
 require_once __DIR__ . "/../utils/basic.inc";
diff --git a/tests/session/session-debug-002.phpt b/tests/session/session-debug-002.phpt
@@ -4,6 +4,7 @@ MongoDB\Driver\Session debug output (after an operation)
 <?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
 <?php skip_if_not_libmongoc_crypto(); ?>
 <?php skip_if_not_replica_set(); ?>
+<?php skip_if_server_version('<', '3.6'); ?>
 --FILE--
 <?php
 require_once __DIR__ . "/../utils/basic.inc";
diff --git a/tests/session/session-getClusterTime-001.phpt b/tests/session/session-getClusterTime-001.phpt
@@ -4,6 +4,7 @@ MongoDB\Driver\Session::getClusterTime()
 <?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
 <?php skip_if_not_libmongoc_crypto(); ?>
 <?php skip_if_not_replica_set(); ?>
+<?php skip_if_server_version('<', '3.6'); ?>
 --FILE--
 <?php
 require_once __DIR__ . "/../utils/basic.inc";
diff --git a/tests/session/session-getOperationTime-001.phpt b/tests/session/session-getOperationTime-001.phpt
@@ -4,6 +4,7 @@ MongoDB\Driver\Session::getOperationTime()
 <?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
 <?php skip_if_not_libmongoc_crypto(); ?>
 <?php skip_if_not_replica_set(); ?>
+<?php skip_if_server_version('<', '3.6'); ?>
 --FILE--
 <?php
 require_once __DIR__ . "/../utils/basic.inc";
diff --git a/tests/writeResult/writeresult-debug-002.phpt b/tests/writeResult/writeresult-debug-002.phpt
