Bug 962495 - [mozrunner] Calling runner.start() with a timeout or out…

…putTimeout, it doesn't handle stopped process. r=hskupin
mozilla · Jan 29, 2014 · b7f3c9c · b7f3c9c
1 parent ec1fbe2
commit b7f3c9c
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/mozrunner/mozrunner/base.py b/mozrunner/mozrunner/base.py
@@ -120,7 +120,11 @@ def is_running(self):
         returns True if the process is active
 
         """
-        return self.process_handler is not None
+        if isinstance(self.process_handler, subprocess.Popen):
+            return self.process_handler.poll() is None
+        elif isinstance(self.process_handler, ProcessHandler):
+            return self.process_handler.proc.poll() is None
+        return False
 
 
     def stop(self, sig=None):

diff --git a/mozrunner/tests/test_start.py b/mozrunner/tests/test_start.py
@@ -30,15 +30,13 @@ def test_start_process_called_twice(self):
         finally:
             process_handler.kill()
 
-    @unittest.skip("Bug 962495 - Mozrunner fails in handling timeout parameter")
     def test_start_with_timeout(self):
         """Start the process and set a timeout"""
         self.runner.start(timeout=2)
         sleep(5)
 
         self.assertFalse(self.runner.is_running())
 
-    @unittest.skip("Bug 962495 - Mozrunner fails in handling outputTimeout parameter")
     def test_start_with_outputTimeout(self):
         """Start the process and set a timeout"""
         self.runner.start(outputTimeout=2)