Merge lp:~thomir-deactivatedaccount/autopilot/fix-qt-killing-slowness into lp:autopilot

[Thomi Richards]

Make sure applications are closed quickly.

This branch fixes the code that closes launched test applications. Previously they were taking a long time to close.

[lp:~thomir-deactivatedaccount/autopilot/fix-qt-killing-slowness]

181. By Thomi Richards on 2013-05-01

remove comments.

[Christopher Lee (veebers)]

Looks good.

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:181
http://jenkins.qa.ubuntu.com/job/autopilot-ci/58/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-raring-amd64-ci/58
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-raring-armhf-ci/57

Click here to trigger a rebuild:
http://s-jenkins:8080/job/autopilot-ci/58/rebuild

review: Approve (continuous-integration)

=== modified file 'autopilot/testcase.py'
--- autopilot/testcase.py	2013-04-30 17:05:03 +0000
+++ autopilot/testcase.py	2013-05-01 17:53:27 +0000
@@ -352,14 +352,15 @@
         return get_application_launcher(app_path)
 
     def _kill_process_and_attach_logs(self, process):
-        process.kill()
+        os.killpg(process.pid, signal.SIGTERM)
         logger.info("waiting for process to exit.")
         for i in range(10):
+            process.poll()
             if process.returncode is not None:
                 break
             if i == 9:
-                logger.info("Terminating process group, since it hasn't exited after 10 seconds.")
-                os.killpg(process.pid, signal.SIGTERM)
+                logger.info("Killing process group, since it hasn't exited after 10 seconds.")
+                os.killpg(process.pid, signal.SIGKILL)
             sleep(1)
         stdout, stderr = process.communicate()
         self.addDetail('process-stdout', text_content(stdout))