Skip to content

Commit ffbd9e3

Browse files
committed
Fixed tests that started failing after two unrelated test improvement merges
1 parent 938ba02 commit ffbd9e3

File tree

2 files changed

+15
-2
lines changed

2 files changed

+15
-2
lines changed

tests/connect/replicaset-seedlist-001.phpt

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,14 @@ require_once __DIR__ . "/../utils/basic.inc";
1212
$secondary = get_secondary_server(URI);
1313
$info = $secondary->getInfo();
1414

15-
$dsn = 'mongodb://' . $info['me'];
15+
// As we're building our own URL here, we do need to extract username and password
16+
$url = parse_url(URI);
17+
if (array_key_exists('user', $url) && array_key_exists('pass', $url)) {
18+
$dsn = sprintf('mongodb://%s:%s@%s', $url['user'], $url['pass'], $info['me']);
19+
} else {
20+
$dsn = 'mongodb://' . $info['me'];
21+
}
22+
1623
$manager = new MongoDB\Driver\Manager($dsn, ['replicaSet' => $info['setName']]);
1724

1825
// load fixtures for test

tests/connect/replicaset-seedlist-002.phpt

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,14 @@ require_once __DIR__ . "/../utils/basic.inc";
1212
$primary = get_primary_server(URI);
1313
$info = $primary->getInfo();
1414

15+
// As we're building our own URL here, we do need to extract username and password
1516
// We already checked whether there is an arbiter through `skip_if_no_arbiter`
16-
$dsn = 'mongodb://' . $info['arbiters'][0];
17+
$url = parse_url(URI);
18+
if (array_key_exists('user', $url) && array_key_exists('pass', $url)) {
19+
$dsn = sprintf('mongodb://%s:%s@%s', $url['user'], $url['pass'], $info['arbiters'][0]);
20+
} else {
21+
$dsn = 'mongodb://' . $info['arbiters'][0];
22+
}
1723

1824
$manager = new MongoDB\Driver\Manager($dsn, ['replicaSet' => $info['setName']]);
1925

0 commit comments

Comments
 (0)