Skip to content

Commit 9a52fcd

Browse files
committed
PHPC-1412: Disable retryWrites for tests using local DB
Additionally, we can use the generated collection name instead of "example".
1 parent 8bc8be5 commit 9a52fcd

File tree

3 files changed

+14
-10
lines changed

3 files changed

+14
-10
lines changed

tests/replicaset/manager-selectserver-001.phpt

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,15 @@ MongoDB\Driver\Manager::selectServer() select a server from SDAM based on ReadPr
44
<?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
55
<?php skip_if_not_replica_set(); ?>
66
<?php skip_if_not_clean(); ?>
7-
<?php skip_if_not_clean('local', 'example'); ?>
7+
<?php skip_if_not_clean('local', COLLECTION_NAME); ?>
88
--FILE--
99
<?php
1010
require_once __DIR__ . "/../utils/basic.inc";
1111

12+
// Disable retryWrites since the test writes to the unreplicated "local" database
13+
$manager = new MongoDB\Driver\Manager(URI, ['retryWrites' => false]);
14+
1215
$rp = new MongoDB\Driver\ReadPreference(MongoDB\Driver\ReadPreference::RP_PRIMARY);
13-
$manager = new MongoDB\Driver\Manager(URI);
1416
$server = $manager->selectServer($rp);
1517
$rp2 = new MongoDB\Driver\ReadPreference(MongoDB\Driver\ReadPreference::RP_PRIMARY);
1618
$server2 = $manager->selectServer($rp2);
@@ -48,7 +50,7 @@ $bulk = new \MongoDB\Driver\BulkWrite();
4850
$bulk->insert(array('_id' => 1, 'x' => 2, 'y' => 3));
4951
$bulk->insert(array('_id' => 2, 'x' => 3, 'y' => 4));
5052
$bulk->insert(array('_id' => 3, 'x' => 4, 'y' => 5));
51-
$result = $server2->executeBulkWrite("local.example", $bulk);
53+
$result = $server2->executeBulkWrite('local.' . COLLECTION_NAME, $bulk);
5254
var_dump($result->getInsertedCount());
5355
?>
5456
===DONE===

tests/replicaset/writeresult-getserver-002.phpt

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,13 @@ MongoDB\Driver\Server: Manager->getServer() returning correct server
55
<?php skip_if_not_replica_set(); ?>
66
<?php skip_if_no_secondary(); ?>
77
<?php skip_if_not_clean(); ?>
8-
<?php skip_if_not_clean('local', 'examples'); ?>
8+
<?php skip_if_not_clean('local', COLLECTION_NAME); ?>
99
--FILE--
1010
<?php
1111
require_once __DIR__ . "/../utils/basic.inc";
1212

13-
$manager = new MongoDB\Driver\Manager(URI);
13+
// Disable retryWrites since the test writes to the unreplicated "local" database
14+
$manager = new MongoDB\Driver\Manager(URI, ['retryWrites' => false]);
1415

1516

1617
$doc = array("example" => "document");
@@ -41,13 +42,13 @@ var_dump($server->getPort(), $server3->getPort());
4142
$bulk = new \MongoDB\Driver\BulkWrite();
4243
$bulk->insert($doc);
4344

44-
$result = $server3->executeBulkWrite("local.examples", $bulk);
45+
$result = $server3->executeBulkWrite('local.' . COLLECTION_NAME, $bulk);
4546
var_dump($result, $result->getServer()->getHost(), $result->getServer()->getPort());
46-
$result = $server3->executeQuery("local.examples", new MongoDB\Driver\Query(array()));
47+
$result = $server3->executeQuery('local.' . COLLECTION_NAME, new MongoDB\Driver\Query(array()));
4748
foreach($result as $document) {
4849
var_dump($document);
4950
}
50-
$cmd = new MongoDB\Driver\Command(array("drop" => "examples"));
51+
$cmd = new MongoDB\Driver\Command(['drop' => COLLECTION_NAME]);
5152
$server3->executeCommand("local", $cmd);
5253

5354
?>

tests/server/server-executeBulkWrite-005.phpt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,13 @@ MongoDB\Driver\Server::executeBulkWrite() with write concern (replica set second
44
<?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
55
<?php skip_if_not_replica_set(); ?>
66
<?php skip_if_no_secondary(); ?>
7-
<?php skip_if_not_clean(); ?>
7+
<?php skip_if_not_clean('local', COLLECTION_NAME); ?>
88
--FILE--
99
<?php
1010
require_once __DIR__ . "/../utils/basic.inc";
1111

12-
$manager = new MongoDB\Driver\Manager(URI);
12+
// Disable retryWrites since the test writes to the unreplicated "local" database
13+
$manager = new MongoDB\Driver\Manager(URI, ['retryWrites' => false]);
1314
$server = $manager->selectServer(new MongoDB\Driver\ReadPreference(MongoDB\Driver\ReadPreference::RP_SECONDARY));
1415

1516
/* The server ignores write concerns with w>2 for writes to the local database,

0 commit comments

Comments
 (0)