ubuntu-system-settings

Merge lp:~jonas-drange/ubuntu-system-settings/lp1517488 into lp:ubuntu-system-settings

  1. lp1517488
  2. Merge into trunk
Proposed by Jonas G. Drange on 2015-11-18
Status: Merged
Approved by: Ken VanDine on 2015-12-04
Approved revision: 1559
Merged at revision: 1575
Proposed branch: lp:~jonas-drange/ubuntu-system-settings/lp1517488
Merge into: lp:ubuntu-system-settings
Diff against target: 20 lines (+2/-2)
1 file modified
tests/autopilot/ubuntu_system_settings/tests/__init__.py (+2/-2)
To merge this branch: bzr merge lp:~jonas-drange/ubuntu-system-settings/lp1517488
Reviewer Review Type Date Requested Status
Ken VanDine 2015-11-18 Approve on 2015-12-04
PS Jenkins bot continuous-integration Approve on 2015-12-04
Review via email: mp+277833@code.launchpad.net

Commit Message

drop /usr/bin/ from USS binary in autopilot tests

To post a comment you must log in.
lp:~jonas-drange/ubuntu-system-settings/lp1517488 updated on 2015-11-18
1558. By Jonas G. Drange on 2015-11-18

rename variable

PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:1557
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/2497/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/5233
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-amd64-ci/272
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-i386-ci/681
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-touch/4154
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/5253
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/5253/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/25224

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/2497/rebuild

review: Needs Fixing (continuous-integration)
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:1558
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/2502/
Executed test runs:
    ABORTED: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/5243/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-amd64-ci/277
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-i386-ci/686
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-touch/4166/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/5263
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/5263/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/2502/rebuild

review: Needs Fixing (continuous-integration)
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:1558
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/2507/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/5270/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-amd64-ci/282
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-i386-ci/691
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-touch/4181/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/5290
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/5290/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/25282

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/2507/rebuild

review: Needs Fixing (continuous-integration)
lp:~jonas-drange/ubuntu-system-settings/lp1517488 updated on 2015-12-04
1559. By Jonas G. Drange on 2015-12-04

trigger ci

PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:1559
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/2541/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/5599
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-amd64-ci/316
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-i386-ci/725
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-touch/4379
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/5613
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/5613/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/25817

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/2541/rebuild

review: Approve (continuous-integration)
Ken VanDine (ken-vandine) wrote :

Great!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'tests/autopilot/ubuntu_system_settings/tests/__init__.py'
2--- tests/autopilot/ubuntu_system_settings/tests/__init__.py 2015-11-26 13:45:35 +0000
3+++ tests/autopilot/ubuntu_system_settings/tests/__init__.py 2015-12-04 14:05:54 +0000
4@@ -83,7 +83,7 @@
5
6 """Base class for Ubuntu System Settings."""
7
8- APP_PATH = '/usr/bin/system-settings'
9+ BINARY = 'system-settings'
10 DESKTOP_FILE = '/usr/share/applications/ubuntu-system-settings.desktop'
11
12 def setUp(self, panel=None):
13@@ -111,7 +111,7 @@
14 :returns: A proxy object that represents the application. Introspection
15 data is retrievable via this object.
16 """
17- params = [self.APP_PATH]
18+ params = [self.BINARY]
19 if platform.model() != 'Desktop':
20 params.append('--desktop_file_hint={}'.format(self.DESKTOP_FILE))
21

Subscribers

People subscribed via source and target branches