PHPC-1173: Reimplement replica set seedlist tests

derickr · derickr · commit c80778a15364 · 2018-08-10T11:26:42.000+01:00
diff --git a/tests/connect/replicaset-seedlist-001.phpt b/tests/connect/replicaset-seedlist-001.phpt
@@ -1,19 +1,19 @@
 --TEST--
 MongoDB\Driver\Manager: Connecting to Replica Set with only secondary in seedlist
---XFAIL--
-replica set seedlist tests must be reimplemented (PHPC-1173)
 --SKIPIF--
 <?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
 <?php skip_if_not_replica_set(); ?>
+<?php skip_if_no_secondary(); ?>
 <?php skip_if_not_clean(); ?>
-<?php PREDICTABLE(); ?>
 --FILE--
 <?php
 require_once __DIR__ . "/../utils/basic.inc";
 
+$secondary = get_secondary_server(URI);
+$info = $secondary->getInfo();
 
-$dsn = "mongodb://192.168.112.10:3001/?replicaSet=REPLICASET";
-$manager = new MongoDB\Driver\Manager($dsn);
+$dsn = 'mongodb://' . $info['me'];
+$manager = new MongoDB\Driver\Manager($dsn, ['replicaSet' => $info['setName']]);
 
 // load fixtures for test
 $bulk = new \MongoDB\Driver\BulkWrite();
diff --git a/tests/connect/replicaset-seedlist-002.phpt b/tests/connect/replicaset-seedlist-002.phpt
@@ -1,19 +1,21 @@
 --TEST--
 MongoDB\Driver\Manager: Connecting to Replica Set with only arbiter in seedlist
---XFAIL--
-replica set seedlist tests must be reimplemented (PHPC-1173)
 --SKIPIF--
 <?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
 <?php skip_if_not_replica_set(); ?>
+<?php skip_if_no_arbiter(); ?>
 <?php skip_if_not_clean(); ?>
-<?php PREDICTABLE(); ?>
 --FILE--
 <?php
 require_once __DIR__ . "/../utils/basic.inc";
 
+$primary = get_primary_server(URI);
+$info = $primary->getInfo();
 
-$dsn = "mongodb://192.168.112.10:3002/?replicaSet=REPLICASET";
-$manager = new MongoDB\Driver\Manager($dsn);
+// We already checked whether there is an arbiter through `skip_if_no_arbiter`
+$dsn = 'mongodb://' . $info['arbiters'][0];
+
+$manager = new MongoDB\Driver\Manager($dsn, ['replicaSet' => $info['setName']]);
 
 // load fixtures for test
 $bulk = new \MongoDB\Driver\BulkWrite();
diff --git a/tests/manager/manager-executeCommand-002.phpt b/tests/manager/manager-executeCommand-002.phpt
@@ -3,6 +3,7 @@ MongoDB\Driver\Manager::executeCommand() takes a read preference in options arra
 --SKIPIF--
 <?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
 <?php skip_if_not_replica_set(); ?>
+<?php skip_if_no_secondary(); ?>
 <?php skip_if_not_clean(); ?>
 --FILE--
 <?php
diff --git a/tests/manager/manager-executeCommand-003.phpt b/tests/manager/manager-executeCommand-003.phpt
@@ -3,6 +3,7 @@ MongoDB\Driver\Manager::executeCommand() takes a read preference as legacy optio
 --SKIPIF--
 <?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
 <?php skip_if_not_replica_set(); ?>
+<?php skip_if_no_secondary(); ?>
 <?php skip_if_not_clean(); ?>
 --FILE--
 <?php
diff --git a/tests/manager/manager-executeCommand-004.phpt b/tests/manager/manager-executeCommand-004.phpt
@@ -3,6 +3,8 @@ MongoDB\Driver\Manager::executeCommand() options (MONGOC_CMD_RAW)
 --SKIPIF--
 <?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
 <?php skip_if_not_live(); ?>
+<?php skip_if_not_replica_set(); ?>
+<?php skip_if_no_secondary(); ?>
 <?php skip_if_not_clean(); ?>
 <?php skip_if_server_version('<', '3.6'); ?>
 --FILE--
diff --git a/tests/manager/manager-executeQuery-003.phpt b/tests/manager/manager-executeQuery-003.phpt
@@ -3,6 +3,7 @@ MongoDB\Driver\Manager::executeQuery() takes a read preference in options array
 --SKIPIF--
 <?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
 <?php skip_if_not_replica_set(); ?>
+<?php skip_if_no_secondary(); ?>
 <?php skip_if_not_clean(); ?>
 --FILE--
 <?php
diff --git a/tests/manager/manager-executeQuery-004.phpt b/tests/manager/manager-executeQuery-004.phpt
@@ -3,6 +3,7 @@ MongoDB\Driver\Manager::executeQuery() takes a read preference as legacy option
 --SKIPIF--
 <?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
 <?php skip_if_not_replica_set(); ?>
+<?php skip_if_no_secondary(); ?>
 <?php skip_if_not_clean(); ?>
 --FILE--
 <?php
diff --git a/tests/manager/manager-executeReadCommand-001.phpt b/tests/manager/manager-executeReadCommand-001.phpt
@@ -3,6 +3,8 @@ MongoDB\Driver\Manager::executeReadCommand()
 --SKIPIF--
 <?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
 <?php skip_if_not_live(); ?>
+<?php skip_if_not_replica_set(); ?>
+<?php skip_if_no_secondary(); ?>
 <?php skip_if_not_clean(); ?>
 <?php skip_if_server_version('<', '3.6'); ?>
 <?php skip_if_not_server_storage_engine('wiredTiger'); ?>
diff --git a/tests/manager/manager-set-uri-options-001.phpt b/tests/manager/manager-set-uri-options-001.phpt
@@ -1,7 +1,5 @@
 --TEST--
 MongoDB\Driver\Manager: Logging into MongoDB using credentials from $options
---XFAIL--
-parse_url() tests must be reimplemented (PHPC-1177)
 --SKIPIF--
 <?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
 <?php skip_if_not_auth(); ?>
diff --git a/tests/readPreference/bug0146-002.phpt b/tests/readPreference/bug0146-002.phpt
@@ -3,6 +3,8 @@ PHPC-146: ReadPreference primaryPreferred and secondary swapped (find command)
 --SKIPIF--
 <?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
 <?php skip_if_not_live(); ?>
+<?php skip_if_not_replica_set(); ?>
+<?php skip_if_no_secondary(); ?>
 <?php skip_if_not_clean(); ?>
 --FILE--
 <?php
diff --git a/tests/replicaset/manager-getservers-001.phpt b/tests/replicaset/manager-getservers-001.phpt
@@ -3,6 +3,8 @@ MongoDB\Driver\Manager::getServers()
 --SKIPIF--
 <?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
 <?php skip_if_not_replica_set(); ?>
+<?php skip_if_no_secondary(); ?>
+<?php skip_if_no_arbiter(); ?>
 --FILE--
 <?php
 require_once __DIR__ . "/../utils/basic.inc";
diff --git a/tests/replicaset/writeresult-getserver-001.phpt b/tests/replicaset/writeresult-getserver-001.phpt
@@ -3,6 +3,7 @@ MongoDB\Driver\Server: Manager->getServer() returning correct server
 --SKIPIF--
 <?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
 <?php skip_if_not_replica_set(); ?>
+<?php skip_if_no_secondary(); ?>
 --FILE--
 <?php
 require_once __DIR__ . "/../utils/basic.inc";
diff --git a/tests/replicaset/writeresult-getserver-002.phpt b/tests/replicaset/writeresult-getserver-002.phpt
@@ -3,6 +3,7 @@ MongoDB\Driver\Server: Manager->getServer() returning correct server
 --SKIPIF--
 <?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
 <?php skip_if_not_replica_set(); ?>
+<?php skip_if_no_secondary(); ?>
 <?php skip_if_not_clean(); ?>
 <?php skip_if_not_clean('local', 'examples'); ?>
 --FILE--
diff --git a/tests/server/server-executeBulkWrite-005.phpt b/tests/server/server-executeBulkWrite-005.phpt
@@ -3,6 +3,7 @@ MongoDB\Driver\Server::executeBulkWrite() with write concern (replica set second
 --SKIPIF--
 <?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
 <?php skip_if_not_replica_set(); ?>
+<?php skip_if_no_secondary(); ?>
 <?php skip_if_not_clean(); ?>
 --FILE--
 <?php
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_no_secondary(); ?>
 <?php skip_if_server_version('<', '3.2'); ?>
 <?php skip_if_not_clean(DATABASE_NAME, 'system.profile'); ?>
 --FILE--
diff --git a/tests/server/server-executeCommand-003.phpt b/tests/server/server-executeCommand-003.phpt
@@ -3,6 +3,7 @@ MongoDB\Driver\Server::executeCommand() with conflicting read preference for sec
 --SKIPIF--
 <?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
 <?php skip_if_not_replica_set(); ?>
+<?php skip_if_no_secondary(); ?>
 --FILE--
 <?php
 require_once __DIR__ . "/../utils/basic.inc";
diff --git a/tests/server/server-executeCommand-004.phpt b/tests/server/server-executeCommand-004.phpt
@@ -3,6 +3,7 @@ MongoDB\Driver\Server::executeCommand() takes a read preference in options array
 --SKIPIF--
 <?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
 <?php skip_if_not_replica_set(); ?>
+<?php skip_if_no_secondary(); ?>
 <?php skip_if_not_clean(); ?>
 --FILE--
 <?php
diff --git a/tests/server/server-executeCommand-005.phpt b/tests/server/server-executeCommand-005.phpt
@@ -3,6 +3,7 @@ MongoDB\Driver\Server::executeCommand() takes a read preference as legacy option
 --SKIPIF--
 <?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
 <?php skip_if_not_replica_set(); ?>
+<?php skip_if_no_secondary(); ?>
 <?php skip_if_not_clean(); ?>
 --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_no_secondary(); ?>
 <?php skip_if_server_version('<', '3.2'); ?>
 <?php skip_if_not_clean(DATABASE_NAME, 'system.profile'); ?>
 --FILE--
diff --git a/tests/server/server-executeQuery-008.phpt b/tests/server/server-executeQuery-008.phpt
@@ -3,6 +3,7 @@ MongoDB\Driver\Server::executeQuery() with conflicting read preference for secon
 --SKIPIF--
 <?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
 <?php skip_if_not_replica_set(); ?>
+<?php skip_if_no_secondary(); ?>
 <?php skip_if_not_clean(); ?>
 --FILE--
 <?php
diff --git a/tests/server/server-executeQuery-009.phpt b/tests/server/server-executeQuery-009.phpt
@@ -3,6 +3,7 @@ MongoDB\Driver\Server::executeQuery() takes a read preference in options array
 --SKIPIF--
 <?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
 <?php skip_if_not_replica_set(); ?>
+<?php skip_if_no_secondary(); ?>
 <?php skip_if_not_clean(); ?>
 --FILE--
 <?php
diff --git a/tests/server/server-executeQuery-010.phpt b/tests/server/server-executeQuery-010.phpt
@@ -3,6 +3,7 @@ MongoDB\Driver\Server::executeQuery() takes a read preference as legacy option
 --SKIPIF--
 <?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
 <?php skip_if_not_replica_set(); ?>
+<?php skip_if_no_secondary(); ?>
 <?php skip_if_not_clean(); ?>
 --FILE--
 <?php
diff --git a/tests/server/server-executeReadCommand-001.phpt b/tests/server/server-executeReadCommand-001.phpt
@@ -3,6 +3,8 @@ MongoDB\Driver\Server::executeReadCommand()
 --SKIPIF--
 <?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
 <?php skip_if_not_live(); ?>
+<?php skip_if_not_replica_set(); ?>
+<?php skip_if_no_secondary(); ?>
 <?php skip_if_not_clean(); ?>
 <?php skip_if_server_version('<', '3.6'); ?>
 <?php skip_if_not_server_storage_engine('wiredTiger'); ?>
diff --git a/tests/server/server-executeReadCommand_error-001.phpt b/tests/server/server-executeReadCommand_error-001.phpt
@@ -3,6 +3,8 @@ MongoDB\Driver\Server::executeReadCommand() with invalid options
 --SKIPIF--
 <?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
 <?php skip_if_not_live(); ?>
+<?php skip_if_not_replica_set(); ?>
+<?php skip_if_no_secondary(); ?>
 <?php skip_if_not_clean(); ?>
 --FILE--
 <?php
diff --git a/tests/server/server-executeReadWriteCommand_error-001.phpt b/tests/server/server-executeReadWriteCommand_error-001.phpt
@@ -3,6 +3,8 @@ MongoDB\Driver\Server::executeReadWriteCommand() with invalid options
 --SKIPIF--
 <?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
 <?php skip_if_not_live(); ?>
+<?php skip_if_not_replica_set(); ?>
+<?php skip_if_no_secondary(); ?>
 <?php skip_if_not_clean(); ?>
 --FILE--
 <?php
diff --git a/tests/server/server-executeWriteCommand_error-001.phpt b/tests/server/server-executeWriteCommand_error-001.phpt
@@ -3,6 +3,8 @@ MongoDB\Driver\Server::executeWriteCommand() with invalid options
 --SKIPIF--
 <?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
 <?php skip_if_not_live(); ?>
+<?php skip_if_not_replica_set(); ?>
+<?php skip_if_no_secondary(); ?>
 <?php skip_if_not_clean(); ?>
 --FILE--
 <?php
diff --git a/tests/server/server-getTags-002.phpt b/tests/server/server-getTags-002.phpt
@@ -3,6 +3,7 @@ MongoDB\Driver\Server::getTags() with replica set
 --SKIPIF--
 <?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
 <?php skip_if_not_replica_set(); ?>
+<?php skip_if_no_secondary(); ?>
 --FILE--
 <?php
 require_once __DIR__ . "/../utils/basic.inc";
diff --git a/tests/utils/skipif.php b/tests/utils/skipif.php
@@ -39,6 +39,40 @@ function skip_if_not_replica_set()
     is_replica_set(URI) or exit('skip topology is not a replica set');
 }
 
+/**
+ * Skips the test if the topology has no arbiter.
+ */
+function skip_if_no_arbiter()
+{
+    try {
+        $primary = get_primary_server(URI);
+    } catch (ConnectionException $e) {
+        exit('skip primary server is not accessible: ' . $e->getMessage());
+    }
+    $info = $primary->getInfo();
+
+    if (!isset($info['arbiters']) || count($info['arbiters']) < 1) {
+        exit('skip no arbiters available');
+    }
+}
+
+/**
+ * Skips the test if the topology has no secondary.
+ */
+function skip_if_no_secondary()
+{
+    try {
+        $primary = get_primary_server(URI);
+    } catch (ConnectionException $e) {
+        exit('skip primary server is not accessible: ' . $e->getMessage());
+    }
+    $info = $primary->getInfo();
+
+    if (!isset($info['hosts']) || count($info['hosts']) < 2) {
+        exit('skip no secondaries available');
+    }
+}
+
 /**
  * Skips the test if the topology is a standalone.
  */
diff --git a/tests/utils/tools.php b/tests/utils/tools.php
@@ -95,6 +95,18 @@ function get_primary_server($uri)
     return (new Manager($uri))->selectServer(new ReadPreference('primary'));
 }
 
+/**
+ * Returns a secondary server.
+ *
+ * @param string $uri Connection string
+ * @return Server
+ * @throws ConnectionException
+ */
+function get_secondary_server($uri)
+{
+    return (new Manager($uri))->selectServer(new ReadPreference('secondary'));
+}
+
 /**
  * Runs a command and returns whether an exception was thrown or not
  *
@@ -394,15 +406,6 @@ function NEEDS($configuration) {
         exit("skip -- need '$configuration' defined");
     }
 }
-function PREDICTABLE() {
-    global $servers;
-
-    foreach($servers as $k => $v) {
-        if (!defined($k) || !constant($k)) {
-            exit("skip - needs predictable environment (e.g. vagrant)\n");
-        }
-    }
-}
 function SLOW() {
     if (getenv("SKIP_SLOW_TESTS")) {
         exit("skip SKIP_SLOW_TESTS");
