Merge lp://staging/~josharenson/unity8/qa_helpers into lp://staging/unity8

Proposed by Josh Arenson
Status: Merged
Approved by: Albert Astals Cid
Approved revision: 1767
Merged at revision: 1823
Proposed branch: lp://staging/~josharenson/unity8/qa_helpers
Merge into: lp://staging/unity8
Diff against target: 620 lines (+238/-166)
12 files modified
qml/Greeter/ShimGreeter.qml (+45/-0)
qml/Shell.qml (+56/-43)
qml/Stages/ShimStage.qml (+44/-0)
tests/autopilot/unity8/application_lifecycle/tests/__init__.py (+2/-2)
tests/autopilot/unity8/greeter/__init__.py (+52/-0)
tests/autopilot/unity8/indicators/tests/__init__.py (+1/-1)
tests/autopilot/unity8/process_helpers.py (+9/-96)
tests/autopilot/unity8/shell/tests/test_emulators.py (+2/-2)
tests/autopilot/unity8/shell/tests/test_notifications.py (+22/-22)
tests/qmltests/Tutorial/tst_Tutorial.qml (+1/-0)
tests/qmltests/tst_Shell.qml (+2/-0)
tests/qmltests/tst_ShellWithPin.qml (+2/-0)
To merge this branch: bzr merge lp://staging/~josharenson/unity8/qa_helpers
Reviewer Review Type Date Requested Status
Michael Zanetti (community) Abstain
Albert Astals Cid (community) Abstain
PS Jenkins bot (community) continuous-integration Needs Fixing
Leo Arias (community) Approve
Review via email: mp+258435@code.staging.launchpad.net

Commit message

Refactor greeter emulator to unlock the greeter via dbus

Description of the change

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

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

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

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
Leo Arias (elopio) wrote :

Thanks Josh.
A couple of things.

The idea is to use these helpers before autopilot comes to play, so it's better to keep them at the module level instead of getting them as methods in the greeter autopilot custom proxy object.
The namespace of helpers is currently a little mess, so I would put them in tests/autopilot/unity8/greeter/__init__.py instead of where you put them. I have a branch in progress to solve the mess:
https://code.launchpad.net/~canonical-platform-qa/unity8/fix1306340-deprecate_emulators/+merge/257812

Next, I think we can remove the other part of unlock calling wait_for_greeter. But I'm not quite sure about this.
Take a look at my diff: http://paste.ubuntu.com/11014223/
Be warned that I didn't have time to run it, so my assumptions might be wrong or I might have left a stupid mistake.

Last think, please make sure that the code you touch passes the static checks. Call:

python3 -m flake8 .

I'm leaving for lunch, but I'll have time later and tomorrow, in case you need me.

review: Needs Fixing
Revision history for this message
Josh Arenson (josharenson) wrote :

Added a way to lock the greeter via dbus too. Makes everything simpler and eliminates a bit of namespace pollution. The wait_for_greeter check is just run in reverse for the lock. The few manual test I ran seemed ok.

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

Cool! Even more than what I asked for.

You have these flake8 errors:

http://paste.ubuntu.com/11016895/

And you can now remove the unity_proxy_obj argument from:

67 def unlock_unity(unity_proxy_obj=None):
120 def lock_unity(unity_proxy_obj=None):

Revision history for this message
Josh Arenson (josharenson) wrote :

Fixed :-)

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
Leo Arias (elopio) wrote :

:)

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
Leo Arias (elopio) wrote :

oh crap. Removing the argument from unlock caused a lot of failures from the tests that were passing it.

review: Needs Fixing
Revision history for this message
Josh Arenson (josharenson) wrote :

> oh crap. Removing the argument from unlock caused a lot of failures from the
> tests that were passing it.

Humm so add an unused arg or refactor everything... I'll try the refactor first and see how ugly it gets.

Revision history for this message
Josh Arenson (josharenson) wrote :

Refactored.

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
Josh Arenson (josharenson) wrote :
Revision history for this message
Leo Arias (elopio) wrote :

Thank you!

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

 * Did you perform an exploratory manual test run of the code change and any related functionality?
If it's good for Leo it's good for us

 * Did CI run pass?
Known broken AP test

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

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

Text conflict in tests/autopilot/unity8/indicators/tests/__init__.py
Text conflict in tests/autopilot/unity8/process_helpers.py
2 conflicts encountered.

review: Needs Fixing
1767. By Josh Arenson

Resolved merge conflicts

[ Albert Astals Cid ]
* Make runtests fake a test error if make fails
* Make the test more stable
* Use dbus-test-runner instead of dbus-launch
* DirectionalDragArea: improvements & API grooming (LP: #1417920)
* Fix EdgeDragEvaluator when a drag can happen both ways
  (Direction.Horizontal)
[ Josh Arenson ]
* Remove panelHeight property as it is unused.
[ Leo Arias ]
* Initial clean up of the autopilot tests set up. Removed the touch
  device from the test case. Moved the restart of unity to a fixture.
  Removed the unused DragMixin. Updated the setUpClass to use
  process_helpers. Removed the workaround for bug #1238417, already
  fixed. Use the toolkit helper to set the testability environment
  variable. Fixed the indicators base class that was restarting unity
  twice. (LP: #1238417, #1447206)
* Use the base class from the toolkit in autopilot tests.
[ Michael Zanetti ]
* emit application-stop when we're going down (LP: #1326513)
[ Michał Sawicz ]
* UNITY_SCOPES_LIST is no more
[ handsome_feng<email address hidden> ]
* When click the favorite scope in Dash Manager , it just return to
  the corresponding scope page. (LP: #1447056)

Revision history for this message
Josh Arenson (josharenson) wrote :

Resolved and striped tags.

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
Albert Astals Cid (aacid) :
review: Abstain
Revision history for this message
Michael Zanetti (mzanetti) wrote :

Needs a merge

review: Needs Fixing
1768. By Josh Arenson

* No-change rebuild against Qt 5.4.2.
[ Michał Sawicz ]
* Implement full-shell rotation (LP: #1210199)
[ CI Train Bot ]
* New rebuild forced.
* Resync trunk.
[ Daniel d'Andrada ]
* Implemented autopilot-test and fake-sensors for shell-rotation.
[ Mirco Müller ]
* Implemented autopilot-test and fake-sensors for shell-rotation.
[ CI Train Bot ]
* New rebuild forced.
* Resync trunk.
[ Renato Araujo Oliveira Filho ]
* Set the device led color to green. (LP: #1450894)
[ Albert Astals Cid ]
* Add overrides to override functions
* Implement "rating-edit" preview widget (LP: #1318144)
* Make the DashContent::test_mainNavigation test more stable (LP:
  #1450809)
* Use art height as implicitHeight when the header is overlayed and
  there's no summary
[ CI Train Bot ]
* New rebuild forced.
* Resync trunk.
[ Daniel d'Andrada ]
* Introducing FloatingFlickable
* Make Ubuntu.Gestures components install TouchRegistry by themselves
[ Michael Terry ]
* Fix a possible crash in our PAM threading code. (LP: #1425362) (LP:
  #1425362)
* Fix the lockscreen becoming unresponsive after testing an app on the
  device from QtCreator. (LP: #1435364)
[ Nick Dedekind ]
* Fixed desktop stage app focus.
* Fixed issue in laggy indicator autpilot tests (LP: #1446846)
[ Albert Astals Cid ]
* Workarounds for concierge mode.
[ CI Train Bot ]
* New rebuild forced.
* Resync trunk.

Revision history for this message
Michael Zanetti (mzanetti) :
review: Abstain

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