ubuntu-system-tests

Merge lp://staging/~canonical-platform-qa/ubuntu-system-tests/cleanup-inheritance-with-upstreaming into lp://staging/ubuntu-system-tests

  1. cleanup-inheritance-with-upstreaming
  2. Merge into trunk
Proposed by Christopher Lee
Status: Work in progress
Proposed branch: lp://staging/~canonical-platform-qa/ubuntu-system-tests/cleanup-inheritance-with-upstreaming
Merge into: lp://staging/ubuntu-system-tests
Diff against target: 74 lines (+0/-54)
2 files modified
ubuntu_sanity_tests/helpers/unity8/dash.py (+0/-45)
ubuntu_sanity_tests/helpers/unityclickscope.py (+0/-9)
To merge this branch: bzr merge lp://staging/~canonical-platform-qa/ubuntu-system-tests/cleanup-inheritance-with-upstreaming
Reviewer Review Type Date Requested Status
platform-qa-bot continuous-integration Needs Fixing
Federico Gimenez (community) Approve
PS Jenkins bot continuous-integration Approve
prod-platform-qa continuous-integration Pending
Review via email: mp+256420@code.staging.launchpad.net

Commit message

Removing inhouse helpers and troublesome multi-inheritance Click CPO.

Description of the change

Removing inhouse helpers and troublesome multi-inheritance Click CPO.
(Req. this unity8 upstream branch to land first: https://code.launchpad.net/~veebers/unity8/adding-extra-helpers-from-sanity/+merge/256419).

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:112
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sanity-tests-ci/204/
Executed test runs:
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sanity-tests-vivid-amd64-ci/205
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sanity-tests-vivid-armhf-ci/204
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sanity-tests-vivid-i386-ci/204

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sanity-tests-ci/204/rebuild

review: Approve (continuous-integration)
Reply
Revision history for this message
Federico Gimenez (fgimenez) wrote :

LGTM

review: Approve
Reply
Revision history for this message
Brendan Donegan (brendan-donegan) wrote :

When I run this using the packages from the other branches, I get an error about the MainView not being present, and indeed it seems the dash didn't start. Trying to find out why this is - I doubt it's caused by this branch, but needs to be resolved before landing this.

Reply
Revision history for this message
Brendan Donegan (brendan-donegan) wrote :

Note that this is confirmed to be a UITK issue, with the API being changed and breaking unity8-dash

Reply
Revision history for this message
platform-qa-bot (platform-qa-bot) wrote :

FAILED: Continuous integration, rev:112
https://platform-qa-jenkins.ubuntu.com/job/ubuntu-system-tests-ci/18/
Executed test runs:
    FAILURE: https://platform-qa-jenkins.ubuntu.com/job/build-wily-amd64-package/40/console
    FAILURE: https://platform-qa-jenkins.ubuntu.com/job/build-wily-i386-package/41/console
    None: https://platform-qa-jenkins.ubuntu.com/job/generic-update-mp/45/console

Click here to trigger a rebuild:
https://platform-qa-jenkins.ubuntu.com/job/ubuntu-system-tests-ci/18/rebuild

review: Needs Fixing (continuous-integration)
Reply

Unmerged revisions

112. By Christopher Lee

Remove kludge multi-inherit ClickScope as all req. are/will be upstream.

111. By Christopher Lee

Clean up Dash method that I've added in an upstream MP.

110. By Christopher Lee

Remove swipe_to_top as I have put it into a MP for upstream (unity8)

109. By Christopher Lee

Remove method that exists in upstrea. Have commented in the upstream MP that they differ slightly.

108. By Christopher Lee

Remove method that exists upstream verbatim

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches

to all changes: