Merge lp:~canonical-platform-qa/ubuntu-system-tests/retry_for_restart_unity into lp:ubuntu-system-tests

[Sergio Cazzolato]

Adding retry to the restart_unity method to avoid a test case fail when the unity8 job does not start successfully and the pid cannot be retrieved

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:142
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sanity-tests-ci/380/
Executed test runs:
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sanity-tests-wily-amd64-ci/151
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sanity-tests-wily-armhf-ci/152
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sanity-tests-wily-i386-ci/151

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sanity-tests-ci/380/rebuild

review: Approve (continuous-integration)

[Brendan Donegan (brendan-donegan)]

This seems to work well, it even triggered in one case during the run I just did and saved the test case from failing!

review: Approve

[platform-qa-bot (platform-qa-bot)]

FAILED: Continuous integration, rev:142
https://platform-qa-jenkins.ubuntu.com/job/ubuntu-system-tests-ci/13/
Executed test runs:
    FAILURE: https://platform-qa-jenkins.ubuntu.com/job/build-wily-amd64-package/35/console
    FAILURE: https://platform-qa-jenkins.ubuntu.com/job/build-wily-i386-package/36/console
    None: https://platform-qa-jenkins.ubuntu.com/job/generic-update-mp/40/console

Click here to trigger a rebuild:
https://platform-qa-jenkins.ubuntu.com/job/ubuntu-system-tests-ci/13/rebuild

review: Needs Fixing (continuous-integration)

[platform-qa-bot (platform-qa-bot)]

FAILED: Continuous integration, rev:142
https://platform-qa-jenkins.ubuntu.com/job/ubuntu-system-tests-ci/1109/
Executed test runs:
    FAILURE: https://platform-qa-jenkins.ubuntu.com/job/build-xenial-amd64-package/358/console
    FAILURE: https://platform-qa-jenkins.ubuntu.com/job/build-xenial-i386-package/356/console
    None: https://platform-qa-jenkins.ubuntu.com/job/generic-update-mp/1834/console

Click here to trigger a rebuild:
https://platform-qa-jenkins.ubuntu.com/job/ubuntu-system-tests-ci/1109/rebuild

review: Needs Fixing (continuous-integration)

[platform-qa-bot (platform-qa-bot)]

FAILED: Continuous integration, rev:142
https://platform-qa-jenkins.ubuntu.com/job/ubuntu-system-tests-ci/1148/
Executed test runs:
    None: https://platform-qa-jenkins.ubuntu.com/job/generic-update-mp/1920/console

Click here to trigger a rebuild:
https://platform-qa-jenkins.ubuntu.com/job/ubuntu-system-tests-ci/1148/rebuild

review: Needs Fixing (continuous-integration)

Unmerged revisions

142. By Sergio Cazzolato on 2015-06-23

Adding retry to the restart_unity8 method

=== modified file 'ubuntu_system_tests/tests/base.py'
--- ubuntu_system_tests/tests/base.py	2015-06-23 12:48:43 +0000
+++ ubuntu_system_tests/tests/base.py	2015-06-23 16:09:08 +0000
@@ -53,7 +53,6 @@
         super().tearDownClass()
         unity8.ensure_unity_running_and_greeter_hidden()
 
-    @autopilot_logging.log_action(logger.info)
     def launch_unity(self):
         """Launch Unity8 with testability enabled.
 
@@ -81,6 +80,10 @@
         )
         return unity
 
+    @retry(stop_max_attempt_number=3,
+           retry_on_exception=
+           lambda exception: isinstance(exception, psutil.NoSuchProcess))
+    @autopilot_logging.log_action(logger.info)
     def restart_unity(self):
         """Restart and unlock unity8"""
         unity8.ensure_unity_stopped()