Fix running auth tests (#1206)

* Fix running auth tests

* Fix flaky tests on replica sets

* Remove arbiters from replica set config

This was done for auth due to a bug fixed in 3.7.7, but the change was not reverted (see mongodb-labs/drivers-evergreen-tools#38).

* Harden test against non-deterministic return order

Author: alcaeus

.evergreen/config.yml

@@ -513,7 +513,7 @@ tasks:
         - func: "bootstrap mongo-orchestration"
           vars:
             TOPOLOGY: "server"
-            AUTH: "yes"
+            AUTH: "auth"
         - func: "run tests"
 
     - name: "test-standalone-ssl"
@@ -554,7 +554,7 @@ tasks:
         - func: "bootstrap mongo-orchestration"
           vars:
             TOPOLOGY: "replica_set"
-            AUTH: "yes"
+            AUTH: "auth"
         - func: "run tests"
 
     - name: "test-replicaset-old"

.evergreen/orchestration/configs/replica_sets/basic-ssl.json

@@ -0,0 +1,51 @@
+{
+  "id": "repl0",
+  "members": [
+    {
+      "procParams": {
+        "ipv6": true,
+        "bind_ip": "127.0.0.1,::1",
+        "journal": true,
+        "oplogSize": 500,
+        "port": 27017
+      },
+      "rsParams": {
+        "tags": {
+          "ordinal": "one",
+          "dc": "ny"
+        }
+      }
+    },
+    {
+      "procParams": {
+        "ipv6": true,
+        "bind_ip": "127.0.0.1,::1",
+        "journal": true,
+        "oplogSize": 500,
+        "port": 27018
+      },
+      "rsParams": {
+        "tags": {
+          "ordinal": "two",
+          "dc": "pa"
+        }
+      }
+    },
+    {
+      "procParams": {
+        "ipv6": true,
+        "bind_ip": "127.0.0.1,::1",
+        "journal": true,
+        "port": 27019
+      },
+      "rsParams": {
+      }
+    }
+  ],
+  "sslParams": {
+      "sslOnNormalPorts": true,
+      "sslPEMKeyFile": "ABSOLUTE_PATH_REPLACEMENT_TOKEN/.evergreen/x509gen/server.pem",
+      "sslCAFile": "ABSOLUTE_PATH_REPLACEMENT_TOKEN/.evergreen/x509gen/ca.pem",
+      "sslWeakCertificateValidation" : true
+  }
+}

.evergreen/orchestration/configs/replica_sets/basic.json

@@ -0,0 +1,45 @@
+{
+  "id": "repl0",
+  "members": [
+    {
+      "procParams": {
+        "ipv6": true,
+        "bind_ip": "127.0.0.1,::1",
+        "journal": true,
+        "oplogSize": 500,
+        "port": 27017
+      },
+      "rsParams": {
+        "tags": {
+          "ordinal": "one",
+          "dc": "ny"
+        }
+      }
+    },
+    {
+      "procParams": {
+        "ipv6": true,
+        "bind_ip": "127.0.0.1,::1",
+        "journal": true,
+        "oplogSize": 500,
+        "port": 27018
+      },
+      "rsParams": {
+        "tags": {
+          "ordinal": "two",
+          "dc": "pa"
+        }
+      }
+    },
+    {
+      "procParams": {
+        "ipv6": true,
+        "bind_ip": "127.0.0.1,::1",
+        "journal": true,
+        "port": 27019
+      },
+      "rsParams": {
+      }
+    }
+  ]
+}

tests/server/server-executeQuery-008.phpt

@@ -13,10 +13,11 @@ $manager = new MongoDB\Driver\Manager(URI);
 
 $primaryRp = new MongoDB\Driver\ReadPreference(MongoDB\Driver\ReadPreference::RP_PRIMARY);
 $primary = $manager->selectServer($primaryRp);
+$serverCount = count($manager->getServers());
 
 $bulk = new \MongoDB\Driver\BulkWrite;
 $bulk->insert(['_id' => 1, 'x' => 1]);
-$primary->executeBulkWrite(NS, $bulk, new MongoDB\Driver\WriteConcern(MongoDB\Driver\WriteConcern::MAJORITY));
+$primary->executeBulkWrite(NS, $bulk, new MongoDB\Driver\WriteConcern($serverCount));
 
 $secondaryRp = new MongoDB\Driver\ReadPreference(MongoDB\Driver\ReadPreference::RP_SECONDARY);
 $secondary = $manager->selectServer($secondaryRp);

tests/server/server-getTags-002.phpt

@@ -9,21 +9,32 @@ MongoDB\Driver\Server::getTags() with replica set
 require_once __DIR__ . "/../utils/basic.inc";
 
 $manager = new MongoDB\Driver\Manager(URI);
+$command = new MongoDB\Driver\Command(['ping' => 1]);
+$manager->executeCommand(DATABASE_NAME, $command);
 
-$tags = $manager->selectServer(new MongoDB\Driver\ReadPreference(MongoDB\Driver\ReadPreference::RP_PRIMARY))->getTags();
-echo "dc: ", array_key_exists('dc', $tags) ? $tags['dc'] : 'not set', "\n";
-echo "ordinal: ", array_key_exists('ordinal', $tags) ? $tags['ordinal'] : 'not set', "\n";
+function assertSomeServerHasTags(array $servers, array $expectedTags) {
+    foreach ($servers as $server) {
+        /* Using a non-strict comparison guards against tags being returned in
+         * a different order than expected. */
+        if ($expectedTags == $server->getTags()) {
+            printf("Found server with tags: %s\n", json_encode($expectedTags));
+            return;
+        }
+    }
 
-$tags = $manager->selectServer(new MongoDB\Driver\ReadPreference(MongoDB\Driver\ReadPreference::RP_SECONDARY))->getTags();
-echo "dc: ", array_key_exists('dc', $tags) ? $tags['dc'] : 'not set', "\n";
-echo "ordinal: ", array_key_exists('ordinal', $tags) ? $tags['ordinal'] : 'not set', "\n";
+    printf("No server has tags: %s\n", json_encode($expectedTags));
+}
+
+$servers = $manager->getServers();
+assertSomeServerHasTags($servers, ['dc' => 'ny', 'ordinal' => 'one']);
+assertSomeServerHasTags($servers, ['dc' => 'pa', 'ordinal' => 'two']);
+assertSomeServerHasTags($servers, []);
 
 ?>
 ===DONE===
 <?php exit(0); ?>
---EXPECTF--
-dc: ny
-ordinal: one
-dc: pa
-ordinal: two
+--EXPECT--
+Found server with tags: {"dc":"ny","ordinal":"one"}
+Found server with tags: {"dc":"pa","ordinal":"two"}
+Found server with tags: []
 ===DONE===