Replace check for 'TRAVIS' with MongoDB server version check

derickr · derickr · commit 1e06f3428f01 · 2018-01-12T11:55:41.000Z
diff --git a/tests/causal-consistency/causal-consistency-011.phpt b/tests/causal-consistency/causal-consistency-011.phpt
@@ -1,9 +1,8 @@
 --TEST--
 Causal consistency: $clusterTime is not sent in commands to unsupported deployments
 --SKIPIF--
-<?php if (getenv("TRAVIS")) exit("skip This currently fails on Travis because it doesn't run 3.6 yet"); ?>
 <?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
-<?php NEEDS('STANDALONE'); ?>
+<?php NEEDS('STANDALONE'); NEEDS_ATLEAST_MONGODB_VERSION(STANDALONE, "3.6"); ?>
 --FILE--
 <?php
 require_once __DIR__ . "/../utils/basic.inc";
diff --git a/tests/manager/manager-executeCommand-004.phpt b/tests/manager/manager-executeCommand-004.phpt
@@ -1,9 +1,8 @@
 --TEST--
 MongoDB\Driver\Manager::executeCommand() options (MONGOC_CMD_RAW)
 --SKIPIF--
-<?php if (getenv("TRAVIS")) exit("skip This currently tails on Travis because it doesn't run 3.6 yet"); ?>
 <?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
-<?php NEEDS('STANDALONE'); CLEANUP(STANDALONE); ?>
+<?php NEEDS('STANDALONE'); NEEDS_ATLEAST_MONGODB_VERSION(STANDALONE, "3.6"); CLEANUP(STANDALONE); ?>
 --FILE--
 <?php
 require_once __DIR__ . "/../utils/basic.inc";
diff --git a/tests/manager/manager-executeReadCommand-001.phpt b/tests/manager/manager-executeReadCommand-001.phpt
@@ -1,9 +1,8 @@
 --TEST--
 MongoDB\Driver\Manager::executeReadCommand()
 --SKIPIF--
-<?php if (getenv("TRAVIS")) exit("skip This currently tails on Travis because it doesn't run 3.6 yet"); ?>
 <?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
-<?php NEEDS('STANDALONE'); CLEANUP(STANDALONE); ?>
+<?php NEEDS('STANDALONE'); CLEANUP(STANDALONE); NEEDS_ATLEAST_MONGODB_VERSION(STANDALONE, "3.6"); ?>
 --FILE--
 <?php
 require_once __DIR__ . "/../utils/basic.inc";
diff --git a/tests/manager/manager-executeWriteCommand-001.phpt b/tests/manager/manager-executeWriteCommand-001.phpt
@@ -1,9 +1,8 @@
 --TEST--
 MongoDB\Driver\Manager::executeWriteCommand()
 --SKIPIF--
-<?php if (getenv("TRAVIS")) exit("skip This currently tails on Travis because it doesn't run 3.6 yet"); ?>
 <?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
-<?php NEEDS('STANDALONE'); CLEANUP(STANDALONE); ?>
+<?php NEEDS('STANDALONE'); CLEANUP(STANDALONE); NEEDS_ATLEAST_MONGODB_VERSION(STANDALONE, "3.6"); ?>
 --FILE--
 <?php
 require_once __DIR__ . "/../utils/basic.inc";
diff --git a/tests/server/server-executeCommand-006.phpt b/tests/server/server-executeCommand-006.phpt
@@ -1,9 +1,8 @@
 --TEST--
 MongoDB\Driver\Server::executeCommand() options (MONGO_CMD_RAW)
 --SKIPIF--
-<?php if (getenv("TRAVIS")) exit("skip This currently tails on Travis because it doesn't run 3.6 yet"); ?>
 <?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
-<?php NEEDS('STANDALONE'); CLEANUP(STANDALONE); ?>
+<?php NEEDS('STANDALONE'); NEEDS_ATLEAST_MONGODB_VERSION(STANDALONE, "3.6"); CLEANUP(STANDALONE); ?>
 --FILE--
 <?php
 require_once __DIR__ . "/../utils/basic.inc";
diff --git a/tests/server/server-executeReadCommand-001.phpt b/tests/server/server-executeReadCommand-001.phpt
@@ -1,9 +1,8 @@
 --TEST--
 MongoDB\Driver\Server::executeReadCommand()
 --SKIPIF--
-<?php if (getenv("TRAVIS")) exit("skip This currently tails on Travis because it doesn't run 3.6 yet"); ?>
 <?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
-<?php NEEDS('STANDALONE'); CLEANUP(STANDALONE); ?>
+<?php NEEDS('STANDALONE'); NEEDS_ATLEAST_MONGODB_VERSION(STANDALONE, "3.6"); CLEANUP(STANDALONE); ?>
 --FILE--
 <?php
 require_once __DIR__ . "/../utils/basic.inc";
diff --git a/tests/server/server-executeWriteCommand-001.phpt b/tests/server/server-executeWriteCommand-001.phpt
@@ -1,9 +1,8 @@
 --TEST--
 MongoDB\Driver\Server::executeWriteCommand()
 --SKIPIF--
-<?php if (getenv("TRAVIS")) exit("skip This currently tails on Travis because it doesn't run 3.6 yet"); ?>
 <?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
-<?php NEEDS('STANDALONE'); CLEANUP(STANDALONE); ?>
+<?php NEEDS('STANDALONE'); CLEANUP(STANDALONE); NEEDS_ATLEAST_MONGODB_VERSION(STANDALONE, "3.6"); ?>
 --FILE--
 <?php
 require_once __DIR__ . "/../utils/basic.inc";
diff --git a/tests/session/session-001.phpt b/tests/session/session-001.phpt
@@ -1,9 +1,8 @@
 --TEST--
 MongoDB\Driver\Session spec test: Pool is LIFO
 --SKIPIF--
-<?php if (getenv("TRAVIS")) exit("skip This currently fails on Travis because it doesn't run 3.6 yet"); ?>
 <?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
-<?php NEEDS('STANDALONE'); ?>
+<?php NEEDS('STANDALONE'); NEEDS_ATLEAST_MONGODB_VERSION(STANDALONE, "3.6"); ?>
 --FILE--
 <?php
 require_once __DIR__ . "/../utils/basic.inc";
diff --git a/tests/session/session-003.phpt b/tests/session/session-003.phpt
@@ -1,9 +1,8 @@
 --TEST--
 MongoDB\Driver\Session spec test: session cannot be used for different clients
 --SKIPIF--
-<?php if (getenv("TRAVIS")) exit("skip This currently fails on Travis because it doesn't run 3.6 yet"); ?>
 <?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
-<?php NEEDS('STANDALONE'); CLEANUP(STANDALONE); ?>
+<?php NEEDS('STANDALONE'); NEEDS_ATLEAST_MONGODB_VERSION(STANDALONE, "3.6"); CLEANUP(STANDALONE); ?>
 --FILE--
 <?php
 require_once __DIR__ . "/../utils/basic.inc";
diff --git a/tests/session/session-debug-001.phpt b/tests/session/session-debug-001.phpt
@@ -1,9 +1,8 @@
 --TEST--
 MongoDB\Driver\Session debug output (before an operation)
 --SKIPIF--
-<?php if (getenv("TRAVIS")) exit("skip This currently fails on Travis because it doesn't run 3.6 yet"); ?>
 <?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
-<?php NEEDS('STANDALONE'); ?>
+<?php NEEDS('STANDALONE'); NEEDS_ATLEAST_MONGODB_VERSION(STANDALONE, "3.6"); ?>
 --FILE--
 <?php
 require_once __DIR__ . "/../utils/basic.inc";
diff --git a/tests/session/session-debug-003.phpt b/tests/session/session-debug-003.phpt
@@ -1,9 +1,8 @@
 --TEST--
 MongoDB\Driver\Session debug output (causalConsistency=false)
 --SKIPIF--
-<?php if (getenv("TRAVIS")) exit("skip This currently fails on Travis because it doesn't run 3.6 yet"); ?>
 <?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
-<?php NEEDS('STANDALONE'); ?>
+<?php NEEDS('STANDALONE'); NEEDS_ATLEAST_MONGODB_VERSION(STANDALONE, "3.6"); ?>
 --FILE--
 <?php
 require_once __DIR__ . "/../utils/basic.inc";
diff --git a/tests/session/session-getLogicalSessionId-001.phpt b/tests/session/session-getLogicalSessionId-001.phpt
@@ -1,9 +1,8 @@
 --TEST--
 MongoDB\Driver\Session::getLogicalSessionId()
 --SKIPIF--
-<?php if (getenv("TRAVIS")) exit("skip This currently fails on Travis because it doesn't run 3.6 yet"); ?>
 <?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
-<?php NEEDS('STANDALONE'); ?>
+<?php NEEDS('STANDALONE'); NEEDS_ATLEAST_MONGODB_VERSION(STANDALONE, "3.6"); ?>
 --FILE--
 <?php
 require_once __DIR__ . "/../utils/basic.inc";
diff --git a/tests/utils/tools.php b/tests/utils/tools.php
@@ -94,9 +94,9 @@ function TESTCOMMANDS($uri) {
         }
     }
 }
-function NEEDS($uri) {
-    if (!constant($uri)) {
-        exit("skip -- need '$uri' defined");
+function NEEDS($configuration) {
+    if (!constant($configuration)) {
+        exit("skip -- need '$configuration' defined");
     }
 }
 function PREDICTABLE() {
@@ -137,6 +137,25 @@ function LOAD($uri, $dbname = DATABASE_NAME, $collname = COLLECTION_NAME, $filen
     }
 }
 
+function NEEDS_ATLEAST_MONGODB_VERSION($uri, $version) {
+    $manager = new MongoDB\Driver\Manager($uri);
+    $cmd = new MongoDB\Driver\Command(["buildInfo" => 1]);
+    $rp = new MongoDB\Driver\ReadPreference(MongoDB\Driver\ReadPreference::RP_PRIMARY);
+
+    try {
+        $cursor = $manager->executeCommand("admin", $cmd, $rp);
+        $cursor->setTypeMap(['root' => 'array', 'document' => 'array']);
+        $document = current($cursor->toArray());
+
+        if (version_compare($document['version'], $version, '<')) {
+            echo "skip Needs version >= $version, but is {$document['version']}";
+        }
+    } catch(Exception $e) {
+        echo "skip (needs version); $uri ($version): " . $e->getCode(), ": ", $e->getMessage();
+        exit(1);
+    }
+}
+
 function CLEANUP($uri, $dbname = DATABASE_NAME, $collname = COLLECTION_NAME) {
     try {
         $manager = new MongoDB\Driver\Manager($uri);
