Merge lp:~pitti/autopilot/sandbox-run into lp:autopilot

Proposed by Martin Pitt
Status: Superseded
Proposed branch: lp:~pitti/autopilot/sandbox-run
Merge into: lp:autopilot
Diff against target: 63 lines (+4/-5)
4 files modified
bin/autopilot3-sandbox-run (+1/-3)
debian/control (+1/-1)
debian/python3-autopilot.install (+1/-0)
setup.py (+1/-1)
To merge this branch: bzr merge lp:~pitti/autopilot/sandbox-run
Reviewer Review Type Date Requested Status
Thomi Richards (community) Approve
PS Jenkins bot continuous-integration Approve
Review via email: mp+219638@code.launchpad.net

This proposal has been superseded by a proposal from 2014-05-19.

Commit message

* Adjust autopilot-sandbox-run for Python 3 and ship it as autopilot3-sandbox-run.
* Fix exit status of autopilot3-sandbox-run to actually fail if the test fails.
* autopilot-desktop: Add at-spi2-core dependency to avoid long hangs due to D-BUS timeouts.

Description of the change

Bring back autopilot3-sandbox-run.

To post a comment you must log in.
Revision history for this message
Martin Pitt (pitti) wrote :

I tested this with shotwell (which uses this).

lp:~pitti/autopilot/sandbox-run updated
491. By Martin Pitt

Fix autopilot3-sandbox-run exit status

If autopilot fails with a non-zero exit code, capture this in $RC, instead of
capturing the exit status of "echo" (which will always succeed).

Fixes autopilot3-sandbox-run always exiting with 0 even on failure.

Revision history for this message
Martin Pitt (pitti) wrote :
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:490
http://jenkins.qa.ubuntu.com/job/autopilot-ci/735/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-utopic-amd64-ci/9
        deb: http://jenkins.qa.ubuntu.com/job/autopilot-utopic-amd64-ci/9/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-utopic-armhf-ci/9
        deb: http://jenkins.qa.ubuntu.com/job/autopilot-utopic-armhf-ci/9/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-utopic-i386-ci/9
        deb: http://jenkins.qa.ubuntu.com/job/autopilot-utopic-i386-ci/9/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic-autopilot/52
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic-touch/55
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic-autopilot/42
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/262
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/262/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/483
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/483/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/6585
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/7192

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

review: Approve (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
lp:~pitti/autopilot/sandbox-run updated
492. By Martin Pitt

autopilot-desktop: Add at-spi2-core dependency

This avoids long hangs due to D-BUS timeouts. It's better to add it here than
having to track it down and remember it for every test that uses it.

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:491
http://jenkins.qa.ubuntu.com/job/autopilot-ci/737/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-utopic-amd64-ci/11
        deb: http://jenkins.qa.ubuntu.com/job/autopilot-utopic-amd64-ci/11/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-utopic-armhf-ci/11
        deb: http://jenkins.qa.ubuntu.com/job/autopilot-utopic-armhf-ci/11/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-utopic-i386-ci/11
        deb: http://jenkins.qa.ubuntu.com/job/autopilot-utopic-i386-ci/11/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic-autopilot/54
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic-touch/56
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic-autopilot/44
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/264
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/264/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/485
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/485/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/6586
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/7193

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

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

PASSED: Continuous integration, rev:492
http://jenkins.qa.ubuntu.com/job/autopilot-ci/738/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-utopic-amd64-ci/12
        deb: http://jenkins.qa.ubuntu.com/job/autopilot-utopic-amd64-ci/12/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-utopic-armhf-ci/12
        deb: http://jenkins.qa.ubuntu.com/job/autopilot-utopic-armhf-ci/12/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-utopic-i386-ci/12
        deb: http://jenkins.qa.ubuntu.com/job/autopilot-utopic-i386-ci/12/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic-autopilot/55
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic-touch/58
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic-autopilot/45
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/269
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/269/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/493
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/493/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/6588
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/7201

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

review: Approve (continuous-integration)
Revision history for this message
Thomi Richards (thomir-deactivatedaccount) :
review: Approve

Unmerged revisions

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== renamed file 'bin/autopilot-sandbox-run' => 'bin/autopilot3-sandbox-run'
2--- bin/autopilot-sandbox-run 2013-09-13 14:00:56 +0000
3+++ bin/autopilot3-sandbox-run 2014-05-15 08:43:25 +0000
4@@ -34,7 +34,6 @@
5 XVFB_CMD="$(which Xvfb||true)"
6 XVFB_OPT=""
7
8-AP_CMD="$(which autopilot)"
9 AP_OPT=""
10
11 SERVERNUM=5
12@@ -173,6 +172,5 @@
13 export XAUTHORITY=/dev/null
14 wait_for_x $SERVERNUM
15 echo "I: Starting autopilot"
16-dbus-launch --exit-with-session autopilot run $AP_OPT $TESTLIST
17+dbus-launch --exit-with-session python3 -m autopilot.run run $AP_OPT $TESTLIST || RC=$?
18 echo "I: autopilot tests done"
19-RC=$?
20
21=== modified file 'debian/control'
22--- debian/control 2014-05-05 20:26:43 +0000
23+++ debian/control 2014-05-15 08:43:25 +0000
24@@ -99,6 +99,7 @@
25 Architecture: all
26 Section: metapackages
27 Depends: ${misc:Depends},
28+ at-spi2-core,
29 gir1.2-gconf-2.0,
30 gir1.2-glib-2.0,
31 gir1.2-gtk-3.0,
32@@ -121,7 +122,6 @@
33 python3-dbus.mainloop.qt,
34 python3-pyqt4,
35 Recommends: python3-lxml,
36- python3-dbus.mainloop.qt,
37 Description: visualisation application for Autopilot (Python 3)
38 The Autopilot vis tool allows you to inspect an application introspection
39 tree. It is a useful tool for test authors, but not required to run autopilot
40
41=== modified file 'debian/python3-autopilot.install'
42--- debian/python3-autopilot.install 2014-04-29 00:35:12 +0000
43+++ debian/python3-autopilot.install 2014-05-15 08:43:25 +0000
44@@ -1,5 +1,6 @@
45 debian/61-autopilot3-uinput.rules /lib/udev/rules.d
46 usr/bin/autopilot3 /usr/bin/
47+usr/bin/autopilot3-sandbox-run /usr/bin/
48 usr/lib/python3*/*/autopilot*.egg-info
49 usr/lib/python3*/*/autopilot/*.py
50 usr/lib/python3*/*/autopilot/application/*.py
51
52=== modified file 'setup.py'
53--- setup.py 2014-04-29 17:02:20 +0000
54+++ setup.py 2014-05-15 08:43:25 +0000
55@@ -44,7 +44,7 @@
56 license='GPLv3',
57 packages=find_packages(),
58 test_suite='autopilot.tests',
59- scripts=['bin/autopilot-sandbox-run'],
60+ scripts=['bin/autopilot3-sandbox-run'],
61 ext_modules=[autopilot_tracepoint],
62 entry_points={
63 'console_scripts': ['autopilot3 = autopilot.run:main']

Subscribers

People subscribed via source and target branches