Merge lp:~thomir-deactivatedaccount/autopilot/1.3-fix-functional-tests into lp:autopilot/1.3

Proposed by Thomi Richards
Status: Merged
Approved by: Thomi Richards
Approved revision: 340
Merged at revision: 339
Proposed branch: lp:~thomir-deactivatedaccount/autopilot/1.3-fix-functional-tests
Merge into: lp:autopilot/1.3
Diff against target: 26 lines (+5/-0)
2 files modified
autopilot/introspection/__init__.py (+4/-0)
debian/control (+1/-0)
To merge this branch: bzr merge lp:~thomir-deactivatedaccount/autopilot/1.3-fix-functional-tests
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Approve
Christopher Lee (community) Approve
Review via email: mp+187607@code.launchpad.net

Commit message

Fix a missing test dependency, and add more logging when a process exits before we find the introspection interface.

Description of the change

Fix a missing test dependency, and add more logging when a process exits before we find the introspection interface.

To post a comment you must log in.
Revision history for this message
Christopher Lee (veebers) wrote :

Looks good to me.

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'autopilot/introspection/__init__.py'
2--- autopilot/introspection/__init__.py 2013-09-19 19:46:31 +0000
3+++ autopilot/introspection/__init__.py 2013-09-25 21:09:38 +0000
4@@ -288,6 +288,10 @@
5 _get_child_pids.reset_cache()
6 if process is not None and not _process_is_running(process):
7 return_code = process.poll()
8+ stdout, stderr = process.communicate()
9+ logger.error("Process exited with exit code: %d", return_code)
10+ logger.error("Process stdout was: %r", stdout)
11+ logger.error("Process stderr was: %r", stderr)
12 raise ProcessSearchError(
13 "Process exited with exit code: %d"
14 % return_code
15
16=== modified file 'debian/control'
17--- debian/control 2013-09-15 15:37:35 +0000
18+++ debian/control 2013-09-25 21:09:38 +0000
19@@ -102,6 +102,7 @@
20 Architecture: all
21 Depends: ${misc:Depends},
22 ${python:Depends},
23+ dpkg-dev,
24 libautopilot-gtk,
25 libautopilot-qt,
26 python-autopilot,

Subscribers

People subscribed via source and target branches

to all changes: