reuse interop client stub

src/php/tests/interop/interop_client.php

@@ -388,7 +388,7 @@ function timeoutOnSleepingServer($stub)
              'Call status was not DEADLINE_EXCEEDED');
 }
 
-function interop_main($args)
+function _makeStub($args)
 {
     if (!array_key_exists('server_host', $args)) {
         throw new Exception('Missing argument: --server_host is required');
@@ -474,7 +474,15 @@ function interop_main($args)
 
     $stub = new grpc\testing\TestServiceClient($server_address, $opts);
 
-    echo "Connecting to $server_address\n";
+    return $stub;
+}
+
+function interop_main($args, $stub = false) {
+    if (!$stub) {
+        $stub = _makeStub($args);
+    }
+
+    $test_case = $args['test_case'];
     echo "Running test case $test_case\n";
 
     switch ($test_case) {
@@ -524,6 +532,8 @@ function interop_main($args)
             echo "Unsupported test case $test_case\n";
             exit(1);
     }
+
+    return $stub;
 }
 
 if (isset($_SERVER['PHP_SELF']) && preg_match('/interop_client/', $_SERVER['PHP_SELF'])) {

src/php/tests/interop/metrics_client.php

@@ -1,7 +1,7 @@
 <?php
 
-$args = getopt('', ['metric_server_address:', 'total_only::']);
-$parts = explode(':', $args['metric_server_address']);
+$args = getopt('', ['metrics_server_address:', 'total_only::']);
+$parts = explode(':', $args['metrics_server_address']);
 $server_host = $parts[0];
 $server_port = (count($parts) == 2) ? $parts[1] : '';
 

src/php/tests/interop/stress_client.php

@@ -21,6 +21,7 @@ function stress_main($args) {
   $deadline = $args['test_duration_secs'] ?
               ($start_time + $args['test_duration_secs']) : false;
   $num_test_cases = count($args['test_cases']);
+  $stub = false;
 
   while (true) {
     $current_time = microtime(true);
@@ -37,7 +38,7 @@ function stress_main($args) {
       // do actual work, run one interop test case
       $args['test_case'] =
           $args['test_cases'][mt_rand(0, $num_test_cases - 1)];
-      @interop_main($args);
+      $stub = @interop_main($args, $stub);
       $count++;
     }
   }