Merge branch 'v1.8' into v1.9

Author: jmikola

.evergreen/atlas-uris.txt.enc

@@ -10,18 +10,24 @@ if (getenv('TESTS') !== 'tests/atlas.phpt') { echo "skip Atlas tests not wanted\
 <?php
 $urls = explode("\n", file_get_contents('.evergreen/atlas-uris.txt'));
 
-$isMasterCmd = new \MongoDB\Driver\Command(['isMaster' => 1]);
+$command = new \MongoDB\Driver\Command(['ping' => 1]);
 $query = new \MongoDB\Driver\Query([]);
 
 foreach ($urls as $url) {
 	$url = trim($url);
+
 	if ($url == '') {
 		continue;
 	}
 
+	if (strpos($url, '#') === 0) {
+		echo trim(substr($url, 1)), "\n";
+		continue;
+	}
+
 	try {
 		$m = new \MongoDB\Driver\Manager($url);
-		$m->executeCommand('admin', $isMasterCmd);
+		$m->executeCommand('admin', $command);
 		iterator_to_array($m->executeQuery('test.test', $query));
 		echo "PASS\n";
 	} catch(Exception $e) {
@@ -32,16 +38,22 @@ foreach ($urls as $url) {
 ===DONE===
 <?php exit(0); ?>
 --EXPECTF--
+Atlas replica set (3.4)
 PASS
 PASS
+Atlas sharded cluster (3.4)
 PASS
 PASS
+Atlas free tier replica set (4.4)
 PASS
 PASS
+Atlas with only TLSv1.1 enabled (3.4)
 PASS
 PASS
+Atlas with only TLSv1.2 enabled (3.4)
 PASS
 PASS
+Atlas with only TLSv1.2 enabled (3.4) and bad credentials
 FAIL: %s
 FAIL: %s
 ===DONE===