PHON-91: Use the vm by default, allow it to be overridden by the environment variable

bjori · bjori · commit da8cb0bd3a3a · 2014-12-16T13:12:31.000-08:00
diff --git a/scripts/start-servers.php b/scripts/start-servers.php
@@ -2,7 +2,7 @@
 require __DIR__ . "/" . "../tests/utils/orchestration.php";
 
 
-$host = "http://localhost:8889";
+$host = "http://192.168.112.10:8889";
 if ($_ENV && isset($_ENV["ORCHESTRATION"])) {
     $host = $_ENV["ORCHESTRATION"];
 }
diff --git a/tests/utils/basic.inc b/tests/utils/basic.inc
@@ -3,7 +3,7 @@ require __DIR__ . "/" . "orchestration.php";
 require __DIR__ . "/" . "tools.php";
 
 
-$host = "http://localhost:8889";
+$host = "http://192.168.112.10:8889";
 if ($_ENV && isset($_ENV["ORCHESTRATION"])) {
     $host = $_ENV["ORCHESTRATION"];
 }

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`	`require __DIR__ . "/" . "../tests/utils/orchestration.php";`
`3`	`3`
`4`	`4`
`5`		`-$host = "http://localhost:8889";`
	`5`	`+$host = "http://192.168.112.10:8889";`
`6`	`6`	`if ($_ENV && isset($_ENV["ORCHESTRATION"])) {`
`7`	`7`	`$host = $_ENV["ORCHESTRATION"];`
`8`	`8`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@ require __DIR__ . "/" . "orchestration.php";`
`3`	`3`	`require __DIR__ . "/" . "tools.php";`
`4`	`4`
`5`	`5`
`6`		`-$host = "http://localhost:8889";`
	`6`	`+$host = "http://192.168.112.10:8889";`
`7`	`7`	`if ($_ENV && isset($_ENV["ORCHESTRATION"])) {`
`8`	`8`	`$host = $_ENV["ORCHESTRATION"];`
`9`	`9`	`}`