git.iko.soy/unity8
on xenial help sign in
Initialize sessionMode to single when mock is reset (LP: #1667463)

Approved by: Lukáš Tinkl, Unity8 CI Bot

commitbb4ca35878bc7e12b1e7cc870fd8a798f7b5e8f3 authorJosh Arenson <joshua.arenson@canonical.com> dateWed 8 Mar 2017, 09:51 (10 years ago) parent1cb1808bc7f9f8
2 files changed+6−1
compare with xenial
unifiedsplit
tests/mocks/liblightdm/MockController.cpp+2−1 tests/qmltests/Greeter/tst_WideView.qml+4
tests/mocks/liblightdm/MockController.cpp+2−1
@@ -25,6 +25,7 @@ MockController::MockController(QObject *parent)
2525 : QObject(parent)
2626 , m_selectGuestHint(false)
2727 , m_hasGuestAccountHint(false)
28+ , m_sessionMode("single")
2829 , m_fullSessions(
2930 {
3031 {"ubuntu", "Ubuntu"},
@@ -68,7 +69,7 @@ void MockController::reset()
6869 setSelectGuestHint(false);
6970 setHasGuestAccountHint(false);
7071 setUserMode(userMode);
71− setSessionMode("full");
72+ setSessionMode("single");
7273 setNumSessions(numFullSessions());
7374 setShowManualLoginHint(false);
7475 setHideUsersHint(false);
tests/qmltests/Greeter/tst_WideView.qml+4
@@ -355,6 +355,7 @@ StyledItem {
355355 loader.active = true;
356356 tryCompare(loader, "status", Loader.Ready);
357357 removeTimeConstraintsFromSwipeAreas(loader.item);
358+ LightDMController.sessionMode = "single";
358359 }
359360
360361 function getIndexOf(name) {
@@ -418,6 +419,7 @@ StyledItem {
418419 }
419420
420421 function test_sessionIconsAreValid() {
422+ LightDMController.sessionMode = "full";
421423 selectUser("has-password");
422424
423425 // Test the login list icon is valid
@@ -439,6 +441,7 @@ StyledItem {
439441 // Ensure the default session is selected (Ubuntu)
440442 cleanup();
441443
444+ LightDMController.sessionMode = "full";
442445 selectUser("has-password");
443446
444447 var sessionChooserButton = findChild(view, "sessionChooserButton");
@@ -484,6 +487,7 @@ StyledItem {
484487 }
485488
486489 function test_sessionIconShownWithMultipleSessions() {
490+ LightDMController.sessionMode = "full";
487491 selectUser("has-password");
488492
489493 var sessionChooserButton = findChild(view, "sessionChooserButton");