Index: native_client_sdk/src/tools/tests/httpd_test.py |
diff --git a/native_client_sdk/src/tools/tests/httpd_test.py b/native_client_sdk/src/tools/tests/httpd_test.py |
index 8f3749b71f6a40a0820046c1115cea0bd254b26b..ff4ef5add215f290989d17f6f00f128cb2e7bb45 100755 |
--- a/native_client_sdk/src/tools/tests/httpd_test.py |
+++ b/native_client_sdk/src/tools/tests/httpd_test.py |
@@ -63,13 +63,14 @@ class RunTest(unittest.TestCase): |
thread.daemon = True |
thread.start() |
thread.join(timeout) |
- if not thread.is_alive(): |
- returncode, stdout, stderr = queue.get(False) |
- return returncode, stdout, stderr |
+ self.assertFalse(thread.is_alive(), "Thread still running after timeout") |
- return -1, None, None |
+ returncode, stdout, stderr = queue.get(False) |
+ return returncode, stdout, stderr |
- def _GetChromeMockArgs(self, page, http_request_type, sleep, |
+ |
+ @staticmethod |
+ def _GetChromeMockArgs(page, http_request_type, sleep, |
expect_to_be_killed=True): |
args = [] |
if page: |