Merge lp://staging/~mterry/unity8/early-disable into lp://staging/unity8

Proposed by Michael Terry
Status: Merged
Approved by: Albert Astals Cid
Approved revision: 1451
Merged at revision: 1466
Proposed branch: lp://staging/~mterry/unity8/early-disable
Merge into: lp://staging/unity8
Diff against target: 59 lines (+8/-1)
4 files modified
qml/Shell.qml (+5/-1)
tests/qmltests/tst_Shell.qml (+1/-0)
tests/qmltests/tst_ShellWithPin.qml (+1/-0)
tests/qmltests/tst_TabletShell.qml (+1/-0)
To merge this branch: bzr merge lp://staging/~mterry/unity8/early-disable
Reviewer Review Type Date Requested Status
Albert Astals Cid (community) Approve
PS Jenkins bot (community) continuous-integration Needs Fixing
Review via email: mp+242517@code.staging.launchpad.net

Commit message

Make sure that there is no window of opportunity for swiping away greeter before the lockscreen appears.

We actually have code to do this already, but it only protected starting from the greeter's onShowChanged call. So this branch starts the shell disabled from the get-go.

Description of the change

Make sure that there is no window of opportunity for swiping away greeter before the lockscreen appears.

We actually have code to do this already, but it only protected starting from the greeter's onShowChanged call. So this branch starts the shell disabled from the get-go.

== Checklist ==

 * 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

 * 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?
 NA

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

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
Albert Astals Cid (aacid) wrote :

Lots of failed qmluitests, please have a look.

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

qmluitests that seem to have to do with this

qmltestrunner.TabletShell::test_appLaunchDuringGreeter
qmltestrunner.TabletShell::test_leftEdgeDrag
qmltestrunner.TabletShell::test_login
qmltestrunner.TabletShell::test_noLockscreen
qmltestrunner.TabletShell::test_showAndHideGreeterDBusCalls

The other 4 seem to be in trunk already, i'm having a look at them.

1451. By Michael Terry

fix tests by resetting Greeter singleton objects inbetween Shell instances

Revision history for this message
Michael Terry (mterry) wrote :

Thanks for that catch, fixed now.

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?
Yes

 * Did CI run pass? If not, please explain why.
Waiting before top approval

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

review: Approve
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 :

known broken tests

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