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

Proposed by Thomi Richards
Status: Merged
Approved by: Thomi Richards
Approved revision: 492
Merged at revision: 505
Proposed branch: lp:~pitti/autopilot/sandbox-run
Merge into: lp:~autopilot/autopilot/temp-dev
Diff against target: 84 lines (+7/-7)
5 files modified
bin/autopilot3-sandbox-run (+1/-3)
debian/changelog (+3/-2)
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
PS Jenkins bot continuous-integration Approve
Thomi Richards (community) Approve
Review via email: mp+219982@code.launchpad.net

This proposal supersedes a proposal from 2014-05-15.

Commit message

Bring back autopilot3-sandbox-run.

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 : Posted in a previous version of this proposal

I tested this with shotwell (which uses this).

Revision history for this message
Martin Pitt (pitti) wrote : Posted in a previous version of this proposal
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote : Posted in a previous version of this proposal

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 : Posted in a previous version of this proposal
review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote : Posted in a previous version of this proposal

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 : Posted in a previous version of this proposal

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) : Posted in a previous version of this proposal
review: Approve
Revision history for this message
Thomi Richards (thomir-deactivatedaccount) :
review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) :
review: Approve (continuous-integration)

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-19 06:12:26 +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/changelog'
22--- debian/changelog 2014-05-07 23:16:37 +0000
23+++ debian/changelog 2014-05-19 06:12:26 +0000
24@@ -1,5 +1,6 @@
25-autopilot (1.5.0-0ubuntu5) UNRELEASED; urgency=low
26+autopilot (1.5.0+14.10.20140509-0ubuntu1) utopic; urgency=low
27
28+ [ Thomi Richards ]
29 * Remove python2 packages and dependencies, as they're now handled by the
30 autopilot-legacy source package. (lp: #1308661)
31 * Autopilot vis tool can now search the introspection tree. (lp: #1097392)
32@@ -15,7 +16,7 @@
33 * Test result artifacts are no longer overwritten when more than one artifact with
34 the same name is added to a test result (lp: #1214246)
35
36- -- Thomi Richards <thomi.richards@canonical.com> Tue, 29 Apr 2014 11:11:32 +1200
37+ -- Ubuntu daily release <ps-jenkins@lists.canonical.com> Fri, 09 May 2014 00:48:14 +0000
38
39 autopilot (1.4+14.04.20140416-0ubuntu1) trusty; urgency=low
40
41
42=== modified file 'debian/control'
43--- debian/control 2014-05-05 20:26:43 +0000
44+++ debian/control 2014-05-19 06:12:26 +0000
45@@ -99,6 +99,7 @@
46 Architecture: all
47 Section: metapackages
48 Depends: ${misc:Depends},
49+ at-spi2-core,
50 gir1.2-gconf-2.0,
51 gir1.2-glib-2.0,
52 gir1.2-gtk-3.0,
53@@ -121,7 +122,6 @@
54 python3-dbus.mainloop.qt,
55 python3-pyqt4,
56 Recommends: python3-lxml,
57- python3-dbus.mainloop.qt,
58 Description: visualisation application for Autopilot (Python 3)
59 The Autopilot vis tool allows you to inspect an application introspection
60 tree. It is a useful tool for test authors, but not required to run autopilot
61
62=== modified file 'debian/python3-autopilot.install'
63--- debian/python3-autopilot.install 2014-04-29 00:35:12 +0000
64+++ debian/python3-autopilot.install 2014-05-19 06:12:26 +0000
65@@ -1,5 +1,6 @@
66 debian/61-autopilot3-uinput.rules /lib/udev/rules.d
67 usr/bin/autopilot3 /usr/bin/
68+usr/bin/autopilot3-sandbox-run /usr/bin/
69 usr/lib/python3*/*/autopilot*.egg-info
70 usr/lib/python3*/*/autopilot/*.py
71 usr/lib/python3*/*/autopilot/application/*.py
72
73=== modified file 'setup.py'
74--- setup.py 2014-04-29 17:02:20 +0000
75+++ setup.py 2014-05-19 06:12:26 +0000
76@@ -44,7 +44,7 @@
77 license='GPLv3',
78 packages=find_packages(),
79 test_suite='autopilot.tests',
80- scripts=['bin/autopilot-sandbox-run'],
81+ scripts=['bin/autopilot3-sandbox-run'],
82 ext_modules=[autopilot_tracepoint],
83 entry_points={
84 'console_scripts': ['autopilot3 = autopilot.run:main']

Subscribers

People subscribed via source and target branches

to all changes: