Unity 8

Merge lp:~josharenson/unity8/fix-wide-view-mock-sessions-checkbox into lp:unity8

  1. fix-wide-view-mock-sessions-checkbox
  2. Merge into trunk
Proposed by Josh Arenson
Status: Merged
Approved by: Lukáš Tinkl
Approved revision: 2836
Merged at revision: 2856
Proposed branch: lp:~josharenson/unity8/fix-wide-view-mock-sessions-checkbox
Merge into: lp:unity8
Diff against target: 56 lines (+6/-1)
2 files modified
tests/mocks/liblightdm/MockController.cpp (+2/-1)
tests/qmltests/Greeter/tst_WideView.qml (+4/-0)
To merge this branch: bzr merge lp:~josharenson/unity8/fix-wide-view-mock-sessions-checkbox
Reviewer Review Type Date Requested Status
Lukáš Tinkl (community) Approve
Unity8 CI Bot continuous-integration Approve
Review via email: mp+318251@code.launchpad.net

Commit message

Initialize sessionMode to single when mock is reset

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

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

To post a comment you must log in.
Revision history for this message
Unity8 CI Bot (unity8-ci-bot) wrote :

FAILED: Continuous integration, rev:2835
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/3210/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build/4213
    UNSTABLE: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=qmluitests.sh/2486
    UNSTABLE: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=zesty,testname=qmluitests.sh/2486
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/4241
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/4076
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/4076/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/4076
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/4076/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/4076
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/4076/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/4076
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/4076/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/4076
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/4076/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/4076
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/4076/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/3210/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Lukáš Tinkl (lukas-kde) wrote :

The code works fine but there are failing tests:

qmltestrunner.WideView::test_choosingNewSessionChangesLoginListIcon
qmltestrunner.WideView::test_sessionIconShownWithMultipleSessions
qmltestrunner.WideView::test_sessionIconsAreValid

review: Needs Fixing
lp:~josharenson/unity8/fix-wide-view-mock-sessions-checkbox updated
2836. By Josh Arenson

Fix broken tests

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

Fixed the failing tests and made the default sessionMode "single" so that tests that depend on multiple sessions have to ask for it specifically. Should make all tests more consistent.

Revision history for this message
Unity8 CI Bot (unity8-ci-bot) wrote :

FAILED: Continuous integration, rev:2836
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/3230/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build/4238
    UNSTABLE: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=qmluitests.sh/2511
    UNSTABLE: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=zesty,testname=qmluitests.sh/2511
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/4266
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/4101
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/4101/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/4101
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/4101/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/4101
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/4101/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/4101
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/4101/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/4101
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/4101/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/4101
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/4101/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/3230/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Unity8 CI Bot (unity8-ci-bot) wrote :

PASSED: Continuous integration, rev:2836
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/3231/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build/4239
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=qmluitests.sh/2513
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=zesty,testname=qmluitests.sh/2513
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/4267
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/4102
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/4102/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/4102
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/4102/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/4102
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/4102/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/4102
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/4102/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/4102
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/4102/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/4102
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/4102/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/3231/rebuild

review: Approve (continuous-integration)
Revision history for this message
Lukáš Tinkl (lukas-kde) 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.

Yes

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'tests/mocks/liblightdm/MockController.cpp'
2--- tests/mocks/liblightdm/MockController.cpp 2017-01-19 20:12:34 +0000
3+++ tests/mocks/liblightdm/MockController.cpp 2017-02-28 16:50:00 +0000
4@@ -25,6 +25,7 @@
5 : QObject(parent)
6 , m_selectGuestHint(false)
7 , m_hasGuestAccountHint(false)
8+ , m_sessionMode("single")
9 , m_fullSessions(
10 {
11 {"ubuntu", "Ubuntu"},
12@@ -68,7 +69,7 @@
13 setSelectGuestHint(false);
14 setHasGuestAccountHint(false);
15 setUserMode(userMode);
16- setSessionMode("full");
17+ setSessionMode("single");
18 setNumSessions(numFullSessions());
19 setShowManualLoginHint(false);
20 setHideUsersHint(false);
21
22=== modified file 'tests/qmltests/Greeter/tst_WideView.qml'
23--- tests/qmltests/Greeter/tst_WideView.qml 2017-01-24 07:40:40 +0000
24+++ tests/qmltests/Greeter/tst_WideView.qml 2017-02-28 16:50:00 +0000
25@@ -355,6 +355,7 @@
26 loader.active = true;
27 tryCompare(loader, "status", Loader.Ready);
28 removeTimeConstraintsFromSwipeAreas(loader.item);
29+ LightDMController.sessionMode = "single";
30 }
31
32 function getIndexOf(name) {
33@@ -418,6 +419,7 @@
34 }
35
36 function test_sessionIconsAreValid() {
37+ LightDMController.sessionMode = "full";
38 selectUser("has-password");
39
40 // Test the login list icon is valid
41@@ -439,6 +441,7 @@
42 // Ensure the default session is selected (Ubuntu)
43 cleanup();
44
45+ LightDMController.sessionMode = "full";
46 selectUser("has-password");
47
48 var sessionChooserButton = findChild(view, "sessionChooserButton");
49@@ -484,6 +487,7 @@
50 }
51
52 function test_sessionIconShownWithMultipleSessions() {
53+ LightDMController.sessionMode = "full";
54 selectUser("has-password");
55
56 var sessionChooserButton = findChild(view, "sessionChooserButton");

Subscribers

People subscribed via source and target branches