Merge lp://staging/~canonical-platform-qa/unity8/fix1306340-deprecate_emulators into lp://staging/unity8

Proposed by Leo Arias
Status: Merged
Approved by: Michael Zanetti
Approved revision: 1543
Merged at revision: 1838
Proposed branch: lp://staging/~canonical-platform-qa/unity8/fix1306340-deprecate_emulators
Merge into: lp://staging/unity8
Prerequisite: lp://staging/~josharenson/unity8/qa_helpers
Diff against target: 1265 lines (+432/-445)
21 files modified
tests/autopilot/unity8/__init__.py (+6/-2)
tests/autopilot/unity8/application_lifecycle/tests/test_application_lifecycle.py (+4/-2)
tests/autopilot/unity8/dash.py (+7/-7)
tests/autopilot/unity8/fixture_setup.py (+6/-16)
tests/autopilot/unity8/greeter/__init__.py (+42/-1)
tests/autopilot/unity8/greeter/tests/__init__.py (+2/-2)
tests/autopilot/unity8/launcher.py (+3/-3)
tests/autopilot/unity8/process_helpers.py (+2/-1)
tests/autopilot/unity8/sensors.py (+1/-1)
tests/autopilot/unity8/shell/__init__.py (+181/-2)
tests/autopilot/unity8/shell/create_interactive_notification.py (+101/-0)
tests/autopilot/unity8/shell/emulators.py (+52/-0)
tests/autopilot/unity8/shell/emulators/__init__.py (+0/-22)
tests/autopilot/unity8/shell/emulators/create_interactive_notification.py (+0/-101)
tests/autopilot/unity8/shell/emulators/greeter.py (+0/-60)
tests/autopilot/unity8/shell/emulators/main_window.py (+0/-199)
tests/autopilot/unity8/shell/tests/__init__.py (+3/-3)
tests/autopilot/unity8/shell/tests/test_helpers.py (+17/-18)
tests/autopilot/unity8/shell/tests/test_notifications.py (+1/-1)
tests/autopilot/unity8/shell/tests/test_rotation.py (+2/-2)
tests/autopilot/unity8/shell/tests/test_tutorial.py (+2/-2)
To merge this branch: bzr merge lp://staging/~canonical-platform-qa/unity8/fix1306340-deprecate_emulators
Reviewer Review Type Date Requested Status
Michael Zanetti (community) Approve
PS Jenkins bot (community) continuous-integration Approve
Albert Astals Cid (community) Needs Fixing
Brendan Donegan (community) Approve
Sergio Cazzolato (community) Approve
Josh Arenson Pending
Review via email: mp+259202@code.staging.launchpad.net

This proposal supersedes a proposal from 2015-04-29.

Commit message

Reorganized the python test helper modules.
Deprecated the unity8.shell.emulators namespace.

Description of the change

Like a year ago we deprecated the word emulators from autopilot test because it caused a lot of confusion. This change was long due. The unity8 packages are even harder, because they have helpers and tests in multiple levels. With this change, all the helpers in the unity8.component. A next useful change would be to join all the tests in unity8.tests.component.

Are there any related MPs required for this MP to build/function as expected? Please list.

This branch needs:
https://code.launchpad.net/~canonical-platform-qa/unity8/click_item_with_swipe
https://code.launchpad.net/~josharenson/unity8/qa_helpers/+merge/258435

 * Did you perform an exploratory manual test run of your code change and any related functionality?

Only ran the tests.

 * Did you make sure that your branch does not contain spurious tags?

Yes.

 * If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?

No debian packaging changes.

 * If you changed the UI, has there been a design review?

No UI changes.

 * Did you have a look at the warnings when running tests? Can they be reduced?

No warnings introduced.

To post a comment you must log in.
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
review: Needs Fixing (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
review: Needs Fixing (continuous-integration)
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: Needs Fixing (continuous-integration)
1536. By Leo Arias

Merged with trunk.

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: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
Brendan Donegan (brendan-donegan) wrote :

Merging this leaves a file 'tests/autopilot/unity8/greeter/__init__.py.moved', which I assume is not right

review: Needs Fixing
Revision history for this message
Sergio Cazzolato (sergio-j-cazzolato) :
review: Approve
1537. By Leo Arias

Removed the file resulting from a wrong merge.

1538. By Leo Arias

Merged with trunk.

Revision history for this message
Leo Arias (elopio) wrote :

> Merging this leaves a file 'tests/autopilot/unity8/greeter/__init__.py.moved',
> which I assume is not right

Fixed. Thanks for catching that.

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
Brendan Donegan (brendan-donegan) wrote :

Looks good from my POV

review: Approve
Revision history for this message
Nicholas Skaggs (nskaggs) wrote :

Who still needs to add approval here? How can we move this forward?

Revision history for this message
Michael Zanetti (mzanetti) wrote :

small inline comment

review: Needs Information
Revision history for this message
Albert Astals Cid (aacid) wrote :

Text conflict in debian/control
Text conflict in tests/autopilot/unity8/dash.py
Text conflict in tests/autopilot/unity8/process_helpers.py
Conflict: can't delete tests/autopilot/unity8/shell/emulators because it is not empty. Not deleting.
Conflict because tests/autopilot/unity8/shell/emulators is not versioned, but has versioned children. Versioned directory.
Contents conflict in tests/autopilot/unity8/shell/emulators/main_window.py
Text conflict in tests/autopilot/unity8/shell/tests/test_helpers.py
7 conflicts encountered.

review: Needs Fixing
1539. By Richard Huddie

Merged with trunk.

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
Albert Astals Cid (aacid) wrote :

Text conflict in tests/autopilot/unity8/process_helpers.py
1 conflicts encountered.

1540. By Richard Huddie

Merged with trunk.

1541. By Richard Huddie

Update rotation tests to use new helpers.

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: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
1542. By Richard Huddie

Fix unlock unity in fake sensors test and remove duplicated test.

1543. By Richard Huddie

Fix flake8 errors, remove imports using emulator and rename emulator tests to helper tests.

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)
Revision history for this message
Michael Zanetti (mzanetti) wrote :

Yes! Thanks a lot.

 * Did you perform an exploratory manual test run of the code change and any related functionality?

Only tests changed. Makes the pass in Jenkins again.

 * Did CI run pass? If not, please explain why.

it did

 * Did you make sure that the branch does not contain spurious tags?

yes, clean

review: Approve

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