Merge lp:~thomir-deactivatedaccount/autopilot/fix-processmanager-on-phablet-device into lp:autopilot

Proposed by Thomi Richards
Status: Merged
Approved by: Omer Akram
Approved revision: 215
Merged at revision: 217
Proposed branch: lp:~thomir-deactivatedaccount/autopilot/fix-processmanager-on-phablet-device
Merge into: lp:autopilot
Diff against target: 17 lines (+5/-2)
1 file modified
autopilot/testcase.py (+5/-2)
To merge this branch: bzr merge lp:~thomir-deactivatedaccount/autopilot/fix-processmanager-on-phablet-device
Reviewer Review Type Date Requested Status
Omer Akram (community) Approve
PS Jenkins bot continuous-integration Approve
Review via email: mp+164978@code.launchpad.net

Commit message

Disable processmanager snapshotting if there's no processmanager on the current platform.

Description of the change

This branch disables the processmanager snapshot support if the processmanager is not abvailable on the current platform.

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
Revision history for this message
Omer Akram (om26er) wrote :

WFM

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'autopilot/testcase.py'
2--- autopilot/testcase.py 2013-05-16 05:37:18 +0000
3+++ autopilot/testcase.py 2013-05-21 21:12:25 +0000
4@@ -139,8 +139,11 @@
5 self._kb = None
6 self._display = None
7
8- self._app_snapshot = self.process_manager.get_running_applications()
9- self.addCleanup(self._compare_system_with_app_snapshot)
10+ try:
11+ self._app_snapshot = self.process_manager.get_running_applications()
12+ self.addCleanup(self._compare_system_with_app_snapshot)
13+ except RuntimeError:
14+ logger.warning("Process manager backend unavailable, application snapshot support disabled.")
15
16 @property
17 def process_manager(self):

Subscribers

People subscribed via source and target branches