PHPLIB-466: Fix usage of useMultipleMongoses in spec tests

Author: alcaeus

tests/SpecTests/Context.php

@@ -121,7 +121,7 @@ public static function fromRetryableReads(stdClass $test, $databaseName, $collec
         return $o;
     }
 
-    public static function fromRetryableWrites(stdClass $test, $databaseName, $collectionName)
+    public static function fromRetryableWrites(stdClass $test, $databaseName, $collectionName, $useMultipleMongoses)
     {
         $o = new self($databaseName, $collectionName);
 
@@ -134,12 +134,12 @@ public static function fromRetryableWrites(stdClass $test, $databaseName, $colle
             $o->outcomeCollectionName = $test->outcome->collection->name;
         }
 
-        $o->client = new Client(FunctionalTestCase::getUri(), $clientOptions);
+        $o->client = new Client(FunctionalTestCase::getUri($useMultipleMongoses), $clientOptions);
 
         return $o;
     }
 
-    public static function fromTransactions(stdClass $test, $databaseName, $collectionName)
+    public static function fromTransactions(stdClass $test, $databaseName, $collectionName, $useMultipleMongoses)
     {
         $o = new self($databaseName, $collectionName);
 
@@ -159,7 +159,7 @@ public static function fromTransactions(stdClass $test, $databaseName, $collecti
          * re-using a previously persisted libmongoc client object. */
         $clientOptions += ['p' => mt_rand()];
 
-        $o->client = new Client(FunctionalTestCase::getUri(), $clientOptions);
+        $o->client = new Client(FunctionalTestCase::getUri($useMultipleMongoses), $clientOptions);
 
         $session0Options = isset($test->sessionOptions->session0) ? (array) $test->sessionOptions->session0 : [];
         $session1Options = isset($test->sessionOptions->session1) ? (array) $test->sessionOptions->session1 : [];

tests/SpecTests/RetryableWritesSpecTest.php

@@ -2,7 +2,6 @@
 
 namespace MongoDB\Tests\SpecTests;
 
-use MongoDB\Driver\Manager;
 use stdClass;
 use function basename;
 use function file_get_contents;
@@ -29,15 +28,13 @@ public function testRetryableWrites(stdClass $test, array $runOn = null, array $
             $this->markTestSkipped('Transaction numbers are only allowed on a replica set member or mongos (PHPC-1415)');
         }
 
-        if (isset($test->useMultipleMongoses) && $test->useMultipleMongoses && $this->isShardedCluster()) {
-            $this->manager = new Manager(static::getUri(true));
-        }
+        $useMultipleMongoses = isset($test->useMultipleMongoses) && $test->useMultipleMongoses && $this->isShardedCluster();
 
         if (isset($runOn)) {
             $this->checkServerRequirements($runOn);
         }
 
-        $context = Context::fromRetryableWrites($test, $this->getDatabaseName(), $this->getCollectionName());
+        $context = Context::fromRetryableWrites($test, $this->getDatabaseName(), $this->getCollectionName(), $useMultipleMongoses);
         $this->setContext($context);
 
         $this->dropTestAndOutcomeCollections();

tests/SpecTests/TransactionsSpecTest.php

@@ -135,9 +135,7 @@ public function testTransactions(stdClass $test, array $runOn = null, array $dat
             $this->markTestSkipped($test->skipReason);
         }
 
-        if (isset($test->useMultipleMongoses) && $test->useMultipleMongoses && $this->isShardedCluster()) {
-            $this->manager = new Manager(static::getUri(true));
-        }
+        $useMultipleMongoses = isset($test->useMultipleMongoses) && $test->useMultipleMongoses && $this->isShardedCluster();
 
         if (isset($runOn)) {
             $this->checkServerRequirements($runOn);
@@ -150,7 +148,7 @@ public function testTransactions(stdClass $test, array $runOn = null, array $dat
         $databaseName = isset($databaseName) ? $databaseName : $this->getDatabaseName();
         $collectionName = isset($collectionName) ? $collectionName : $this->getCollectionName();
 
-        $context = Context::fromTransactions($test, $databaseName, $collectionName);
+        $context = Context::fromTransactions($test, $databaseName, $collectionName, $useMultipleMongoses);
         $this->setContext($context);
 
         $this->dropTestAndOutcomeCollections();