selection of binary went wrong on Travis, so it started

an old mongod binary on the Travis server.
MARTIMM · May 17, 2016 · b4d47ef · b4d47ef
1 parent 9575605
commit b4d47ef
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 15 deletions.
diff --git a/lib/MongoDB/Server/Control.pm6 b/lib/MongoDB/Server/Control.pm6
@@ -151,6 +151,15 @@ class Server::Control {
     my Hash $config = MongoDB::Config.instance.config;
     my Str $mongodb-server-path;
 
+    # Can be configured in config file
+    #
+    if not $mongodb-server-path.defined and $config<Binaries>:exists
+       and $config<Binaries>{$binary}:exists 
+       and $config<Binaries>{$binary}.IO ~~ :x {
+
+      $mongodb-server-path = $config<Binaries>{$binary};
+    }
+
     # On linuxes it should be in /usr/bin
     #
     if not $mongodb-server-path.defined and $*KERNEL.name eq 'linux' {
@@ -185,14 +194,6 @@ class Server::Control {
       }
     }
 
-    # Can be configured in config file
-    #
-    if not $mongodb-server-path.defined and $config<Binaries>:exists
-       and $config<Binaries>{$binary}:exists {
-
-      $mongodb-server-path = $config<Binaries>{$binary};
-    }
-
     $mongodb-server-path;
   }
 }

diff --git a/t/100-Server.t b/t/100-Server.t
@@ -18,8 +18,8 @@ my MongoDB::Test-support $ts .= new;
 #-------------------------------------------------------------------------------
 subtest {
 
-  my $p4 = $ts.server-control.get-port-number('s4');
-  my MongoDB::Server $server .= new(:server-name("localhost:$p4"));
+  my $p3 = $ts.server-control.get-port-number('s3');
+  my MongoDB::Server $server .= new(:server-name("localhost:$p3"));
 
   my MongoDB::Server::Monitor $monitor .= new(:$server);
   $monitor.start-monitor;
@@ -84,8 +84,8 @@ subtest {
 #-------------------------------------------------------------------------------
 subtest {
 
-  my $p4 = $ts.server-control.get-port-number('s4');
-  my MongoDB::Server $server .= new(:server-name("localhost:$p4"));
+  my $p3 = $ts.server-control.get-port-number('s3');
+  my MongoDB::Server $server .= new(:server-name("localhost:$p3"));
   is $server.get-status, MongoDB::C-UNKNOWN-SERVER, "Status is Unknown";
 
   $server.server-init;

diff --git a/t/101-Server.t b/t/101-Server.t
@@ -21,7 +21,7 @@ my MongoDB::Server $server;
 #-------------------------------------------------------------------------------
 subtest {
 
-  $client = $ts.get-connection(:server(4));
+  $client = $ts.get-connection(:server(3));
   my MongoDB::Server $server = $client.select-server;
   ok $server.defined, 'Connection server available';
 

diff --git a/t/Test-support.pm6 b/t/Test-support.pm6
@@ -20,7 +20,7 @@ class Test-support {
   submethod BUILD ( ) {
 
     # Init here because of need in BUILD later
-    $!nbr-of-servers = 4;
+    $!nbr-of-servers = 3;
     $!server-range = (^$!nbr-of-servers + 1);
 
     #-----------------------------------------------------------------------------
@@ -37,7 +37,7 @@ class Test-support {
     unless 'Sandbox'.IO ~~ :d {
 
       mkdir( 'Sandbox', 0o700);
-      my Int $start-portnbr = 65000;
+      my Int $start-portnbr = 65010;
       my Str $config-text = Q:qq:to/EOCONFIG/;
 
         # Configuration file for the servers in the Sandbox