Fix running auth tests #1206
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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 | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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": { | ||
| } | ||
| } | ||
| ] | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -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); | ||
|
|
||
| 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; | ||
| } | ||
| } | ||
|
|
||
| printf("No server has tags: %s\n", json_encode($expectedTags)); | ||
| } | ||
|
There was a problem hiding this comment. Is this still a potentially flaky test if the order of servers returned by function assertSomeServerHasTags($servers, $expectedTags) {
foreach ($servers as $server) {
if (array_intersect_assoc($expectedTags, $server->getTags()) === $expectedTags) {
printf("Found server with tags: %s\n", json_encode($expectedTags));
return;
}
}
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, []);My understanding of There was a problem hiding this comment. Good point. I've kept the loop but removed the use of A loose equality check works around this, and since we're expecting the tags in the order that we create them I think that should be safe but still protect us against non-deterministic order of the server returned from |
||
|
|
||
| $servers = $manager->getServers(); | ||
| assertSomeServerHasTags($servers, ['dc' => 'ny', 'ordinal' => 'one']); | ||
| assertSomeServerHasTags($servers, ['dc' => 'pa', 'ordinal' => 'two']); | ||
| assertSomeServerHasTags($servers, []); | ||
|
|
||
| ?> | ||
| ===DONE=== | ||
| <?php exit(0); ?> | ||
| --EXPECT-- | ||
| Found server with tags: {"dc":"ny","ordinal":"one"} | ||
| Found server with tags: {"dc":"pa","ordinal":"two"} | ||
| Found server with tags: [] | ||
| ===DONE=== | ||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
If
getTags()returns an array, is there any reason we can't do a strict equality check here?Both are going to enforce the same order AFAIK, and the associative array itself just has string keys and values (no concern with mismatched types).
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I changed to a strict comparison, which then caused tests to fail again. With some debug output, I was able to capture the following diff:
003+ No server has tags: {"ordinal":"two","dc":"pa"} 004+ Server tags: {"localhost:27017":{"ordinal":"one","dc":"ny"},"localhost:27018":{"dc":"pa","ordinal":"two"},"localhost:27019":[]} 003- Found server with tags: {"ordinal":"two","dc":"pa"}As you can see, the tags returned for the second server has a different order from the first, which causes a strict equality check to fail. I've added a comment to clarify why we're using
==in the test for future reference.