PHPC-128: MO presets directory needs to be configurable

various other travis fixes, skipping etc

Author: bjori

.travis.yml

@@ -10,13 +10,14 @@ env:
     - TEST_PHP_ARGS="-q -s output.txt -g XFAIL,FAIL,BORK,WARN,LEAK,SKIP -x --show-diff"
     - REPORT_EXIT_STATUS=1
     - MONGODB_ORCHESTRATION="http://localhost:8889"
-    - MONGO_ORCHESTRATION_REPO="git+git://github.com/mongodb/mongo-orchestration@master"
+    - MONGODB_ORCHESTRATION_REPO="git+git://github.com/mongodb/mongo-orchestration@master"
+    - MONGODB_ORCHESTRATION_PRESETS_ROOT=`pwd`
     - secure: uOPk40++5SqPwsvENvQXKy3sJmOYFoPxTSPpoafbus9teEqe3S0mXAv6leSUSH4K/vk1OoPFp2xjKRVkdBTeqTElna1DDWOuYlvli9PLSvyZ+b1bV+8Ap18BxqlYhd3tHrY7tIliOsh6dZplWF9GyUm9DWBZ/80uKUidh/Brg/Y=
     - secure: "pfGVPucvgcgcefhtzAVeejlpOtn4TnAqJSTM8mJkBl36KdU9P7hMuD3czQ4drWgzZ373/VT5UVhLu/HNsdbW0YBTeqPKJ4YNjqVVLytI8xT7y2Lw9l+I7o93j98TMgAoo8nVRmp/E4D6yutbKK1eddrcmf899R1iJbw8v8d1Ht8="
 
 before_install:
   - sudo pip install cpp-coveralls
-  - sudo pip install ${MONGO_ORCHESTRATION_REPO}
+  - sudo pip install ${MONGODB_ORCHESTRATION_REPO}
   - sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 7F0CEB10
   - echo 'deb http://downloads-distro.mongodb.org/repo/ubuntu-upstart dist 10gen' | sudo tee /etc/apt/sources.list.d/mongodb.list
   - sudo apt-get update

scripts/start-servers.php

@@ -15,7 +15,7 @@ function lap() {
     $host = "http://192.168.112.10:8889";
 }
 
-$orch = new Mongo\Orchestration($host);
+$orch = new Mongo\Orchestration($host, getenv("MONGODB_ORCHESTRATION_PRESETS_ROOT"));
 if (!$orch->ping()) {
     var_dump($host);
     system("pwd");
@@ -29,7 +29,12 @@ function lap() {
 $orch->stopAll();
 
 $res = $orch->start("standalone.json");
-printf("Standalone running on:\t\t\t(took: %.2f secs)\t%s\n", lap(), $res);
+if ($res) {
+    printf("Standalone running on:\t\t\t(took: %.2f secs)\t%s\n", lap(), $res);
+} else {
+    printf("Failed starting standalone.json after %.2f secs\n", lap());
+    exit(1);
+}
 
 if (getenv("TRAVIS")) {
     echo "Skipping special nodes on travis\n";

tests/repliacset/writeconcernerror-0001.phpt renamed to tests/replicaset/writeconcernerror-0001.phpt

@@ -8,9 +8,10 @@ require __DIR__ . "/" . "basic.inc";
 $testdir = basename(dirname(realpath($_SERVER["SCRIPT_FILENAME"])));
 
 switch($testdir){
+case "replicaset":
 case "connect":
-    if (!$orch->ping()) {
-        exit("skip these tests in $testdir require Mongo Orchestration");
+    if (!$orch->ping() || getenv("TRAVIS") || !MONGODB_STANDALONE_AUTH_URI) {
+        exit("skip these tests in $testdir require Mongo Orchestration + vagrant");
     }
     break;
 }

tests/utils/basic-skipif.inc

@@ -7,7 +7,7 @@ if (!($host = getenv("MONGODB_ORCHESTRATION"))) {
     $host = "http://192.168.112.10:8889";
 }
 
-$orch = new Mongo\Orchestration($host);
+$orch = new Mongo\Orchestration($host, getenv("MONGODB_ORCHESTRATION_PRESETS_ROOT"));
 if ($orch->ping()) {
     $consts = array(
         "MONGODB_URI"                   => $orch->getURI("standalone.json"),

tests/utils/basic.inc

@@ -6,10 +6,11 @@ class Orchestration {
     protected $baseuri;
     protected $conf;
 
-    function __construct($baseuri) {
+    function __construct($baseuri, $prefix = NULL) {
         $this->baseuri = $baseuri;
         $this->conf = array(
             "timeout" => 60,
+            "prefix"  => $prefix ?: "/phongo/",
         );
     }
 
@@ -47,7 +48,7 @@ function startRS($preset) {
             throw new \Exception("Cannot file $file in $relative");
         }
 
-        $retval = $this->post("replica_sets", ["preset" => "/phongo/$file"]);
+        $retval = $this->post("replica_sets", ["preset" => $this->getPrefix() . "$file"]);
         return $this->_returnURIIfAlive($retval);
     }
     function start($preset) {
@@ -57,7 +58,7 @@ function start($preset) {
             throw new \Exception("Cannot file $file in $relative");
         }
 
-        $retval = $this->post("servers", ["preset" => "/phongo/$file"]);
+        $retval = $this->post("servers", ["preset" => $this->getPrefix() . "$file"]);
         return $this->_returnURIIfAlive($retval);
     }
 
@@ -103,6 +104,9 @@ function setTimeout($t) {
     function getTimeout() {
         return $this->conf["timeout"];
     }
+    function getPrefix() {
+        return $this->conf["prefix"] . "/";
+    }