Merge lp://staging/~canonical-platform-qa/ubuntu-ui-toolkit/fix1429163-nopy2 into lp://staging/ubuntu-ui-toolkit/staging
Proposed by
Leo Arias
| Status: | Merged | ||||
|---|---|---|---|---|---|
| Approved by: | Cris Dywan | ||||
| Approved revision: | 1476 | ||||
| Merged at revision: | 1485 | ||||
| Proposed branch: | lp://staging/~canonical-platform-qa/ubuntu-ui-toolkit/fix1429163-nopy2 | ||||
| Merge into: | lp://staging/ubuntu-ui-toolkit/staging | ||||
| Diff against target: |
1057 lines (+87/-154) 42 files modified
debian/control (+0/-9) debian/ubuntu-ui-toolkit-autopilot.install (+0/-1) push_to_phone.sh (+0/-1) tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_common.py (+2/-2) tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_header.py (+1/-1) tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_mainview.py (+2/-2) tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_textfield.py (+1/-1) tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/popups.py (+0/-3) tests/autopilot/ubuntuuitoolkit/base.py (+2/-2) tests/autopilot/ubuntuuitoolkit/fixture_setup.py (+10/-10) tests/autopilot/ubuntuuitoolkit/tests/__init__.py (+3/-3) tests/autopilot/ubuntuuitoolkit/tests/components/test_header.py (+2/-2) tests/autopilot/ubuntuuitoolkit/tests/components/test_popover.py (+1/-4) tests/autopilot/ubuntuuitoolkit/tests/components/test_textinput.py (+3/-3) tests/autopilot/ubuntuuitoolkit/tests/components/test_units.py (+1/-1) tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_checkbox.py (+2/-5) tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_common.py (+2/-5) tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_date_picker.py (+2/-2) tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_dialog.py (+1/-4) tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_flickable.py (+2/-5) tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_header.py (+4/-4) tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_listitem.py (+1/-1) tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_listitems.py (+3/-6) tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_main_view.py (+2/-5) tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_optionselector.py (+3/-3) tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_popups.py (+1/-1) tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_pull_to_refresh.py (+2/-2) tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_qquicklistview.py (+4/-7) tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_tabs.py (+2/-5) tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_textarea.py (+2/-5) tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_textfield.py (+2/-5) tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_toolbar.py (+2/-5) tests/autopilot/ubuntuuitoolkit/tests/gallery/__init__.py (+3/-3) tests/autopilot/ubuntuuitoolkit/tests/gallery/test_buttons.py (+1/-1) tests/autopilot/ubuntuuitoolkit/tests/gallery/test_optionselector.py (+2/-2) tests/autopilot/ubuntuuitoolkit/tests/gallery/test_scrollbar.py (+2/-2) tests/autopilot/ubuntuuitoolkit/tests/gallery/test_textinput.py (+3/-3) tests/autopilot/ubuntuuitoolkit/tests/gallery/test_toggles.py (+3/-3) tests/autopilot/ubuntuuitoolkit/tests/test_fixture_setup.py (+4/-9) tests/autopilot/ubuntuuitoolkit/tests/test_launcher.py (+1/-7) tests/autopilot/ubuntuuitoolkit/tests/test_ubuntu_scenarios.py (+2/-5) tests/tests.pro (+1/-4) |
||||
| To merge this branch: | bzr merge lp://staging/~canonical-platform-qa/ubuntu-ui-toolkit/fix1429163-nopy2 | ||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Cris Dywan | Approve | ||
| PS Jenkins bot | continuous-integration | Approve | |
|
Review via email:
|
|||
This proposal supersedes a proposal from 2015-04-14.
Commit message
Removed python2 support from autopilot tests and helpers.
To post a comment you must log in.
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
FAILED: Continuous integration, rev:1475
http://
Executed test runs:
FAILURE: http://
FAILURE: http://
FAILURE: http://
FAILURE: http://
FAILURE: http://
Click here to trigger a rebuild:
http://