Added utility to make different tests bind to different ports

Change on 2014/12/10 by mlumish <mlumish@google.com> ------------- Created by MOE: http://code.google.com/p/moe-java MOE_MIGRATED_REVID=81800876
enisoc · Dec 10, 2014 · f5aa29b · f5aa29b
1 parent 8919f60
commit f5aa29b
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 4 deletions.
diff --git a/src/php/tests/unit_tests/EndToEndTest.php b/src/php/tests/unit_tests/EndToEndTest.php
@@ -1,11 +1,13 @@
 <?php
+require __DIR__ . '/../util/port_picker.php';
 class EndToEndTest extends PHPUnit_Framework_TestCase{
   public function setUp() {
     $this->client_queue = new Grpc\CompletionQueue();
     $this->server_queue = new Grpc\CompletionQueue();
     $this->server = new Grpc\Server($this->server_queue, []);
-    $this->server->add_http2_port('localhost:9000');
-    $this->channel = new Grpc\Channel('localhost:9000', []);
+    $address = '127.0.0.1:' . getNewPort();
+    $this->server->add_http2_port($address);
+    $this->channel = new Grpc\Channel($address, []);
   }
 
   public function tearDown() {

diff --git a/src/php/tests/unit_tests/SecureEndToEndTest.php b/src/php/tests/unit_tests/SecureEndToEndTest.php
@@ -11,9 +11,10 @@ public function setUp() {
         file_get_contents(dirname(__FILE__) . '/../data/server1.pem'));
     $this->server = new Grpc\Server($this->server_queue,
                                     ['credentials' => $server_credentials]);
-    $this->server->add_secure_http2_port('localhost:9000');
+    $address = '127.0.0.1:' . getNewPort();
+    $this->server->add_secure_http2_port($address);
     $this->channel = new Grpc\Channel(
-        'localhost:9000',
+        $address,
         [
             'grpc.ssl_target_name_override' => 'foo.test.google.com',
             'credentials' => $credentials

diff --git a/src/php/tests/util/port_picker.php b/src/php/tests/util/port_picker.php
@@ -0,0 +1,6 @@
+<?php
+function getNewPort() {
+  static $port = 10000;
+  $port += 1;
+  return $port;
+}