Commits

masklinn committed 2f65624

Force termination of phantomjs subprocess if the suite is done running or there was an error, don't wait for a timeout

Comments (0)

Files changed (1)

qunitsuite/suite.py

             })
         ], stdout=subprocess.PIPE)
 
-        while True:
-            line = phantom.stdout.readline()
-            if line:
-                if self.process(line, result):
-                    break
-            else:
-                time.sleep(0.1)
+        try:
+            while True:
+                line = phantom.stdout.readline()
+                if line:
+                    if self.process(line, result):
+                        break
+                else:
+                    time.sleep(0.1)
+        finally:
+            # If the phantomjs process hasn't quit, kill it
+            if phantom.poll() is None:
+                phantom.terminate()
 
     def process(self, line, result):
         args = json.loads(line)