All tests can run in one go without stalling

makewebau · May 22, 2018 · c74a40d · c74a40d
1 parent 076e1a4
commit c74a40d
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 7 deletions.
diff --git a/tests/TestCase.php b/tests/TestCase.php
@@ -52,9 +52,11 @@ public static function start()
  while (@file_get_contents("http://$url/get") === false) {
  usleep(1000);
  }
- register_shutdown_function(function () use ($pid) {
- exec('kill '.$pid);
- });
+ global $kill_test_server;
+ $kill_test_server = function () use ($pid) {
+ exec('kill '.$pid.' 2>/dev/null');
+ };
+ register_shutdown_function($kill_test_server);
  }
  };
 

diff --git a/tests/unit/ApiClientTest.php b/tests/unit/ApiClientTest.php
@@ -22,10 +22,10 @@ public function get_latest_version_test()
  $this->assertInstanceOf(Version::class, $response->version);
 
  foreach ([
- 'new_version'  => '1.2.3',
+ 'new_version' => '1.2.3',
  'stable_version' => '1.2.3',
- 'name'  => 'Test Plugin',
- 'slug'  => 'test-plugin',
+ 'name' => 'Test Plugin',
+ 'slug' => 'test-plugin',
  ] as $key => $value) {
  $this->assertEquals($value, $response->version->$key);
  }
@@ -62,13 +62,15 @@ public function get_latest_version_call_gracefully_handles_timeout()
  ));
 
  $apiClient->setTimeout(1);
-
  $response = $apiClient->getLatestVersion();
 
  $this->assertTrue($response->isError());
  $this->assertEquals('500', $response->code);
  $this->assertTrue(
  Str::contains($response->message, 'http_request_failed: cURL error 28: Operation timed out after')
  );
+ global $kill_test_server;
+
+ @$kill_test_server();
  }
 }