Merge lp:~josharenson/unity8/fix-session-icon into lp:unity8

[Josh Arenson]

Enable the greeter to remember which session the user last logged into

This also fixes a small issue with how the default session was handled.

* 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

[Unity8 CI Bot (unity8-ci-bot)]

PASSED: Continuous integration, rev:2659
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/2419/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build/3173
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=vivid+overlay,testname=qmluitests.sh/1810
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=qmluitests.sh/1810
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=yakkety,testname=qmluitests.sh/1810
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/3201
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/3057
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/3057/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/3057
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/3057/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=yakkety/3057
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=yakkety/3057/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/3057
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/3057/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/3057
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/3057/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=yakkety/3057
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=yakkety/3057/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/3057
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/3057/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/3057
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/3057/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=yakkety/3057
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=yakkety/3057/artifact/output/*zip*/output.zip

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

review: Approve (continuous-integration)

[Albert Astals Cid (aacid)]

Tested, seems to work well.

Is this something that we can autotest?

review: Needs Information

[Josh Arenson (josharenson)]

> Tested, seems to work well.
>
> Is this something that we can autotest?

There are some existing tests for the session icons. I think the level of effort to test this small issue would be very high, if even possible. The information for this field is delivered from AccountService via LightDM and thus, would likely require substantial updates to the mocks. Perhaps I'm overthinking this...

 It may be a good candidate for an autopilot test, however. If you disagree, lets discuss in person.

[Albert Astals Cid (aacid)]

talked in person, agreed that Josh will evaluate how hard is to add an autotest for the Greeter in which we have two users, set the last used session of user2 to be X (non default) and then while moving to user2 we check that the selected session is the one we set.

[Josh Arenson (josharenson)]

Kind of gross, but I added a test.

[Unity8 CI Bot (unity8-ci-bot)]

FAILED: Continuous integration, rev:2583
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/2480/
Executed test runs:
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build/3269/console
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/3297
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/3151
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/3151/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/3151
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/3151/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/3151
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/3151/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/3151
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/3151/artifact/output/*zip*/output.zip
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/3151/console
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/3151
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/3151/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/3151
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/3151/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/3151
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/3151/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/3151
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/3151/artifact/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)

[Unity8 CI Bot (unity8-ci-bot)]

FAILED: Continuous integration, rev:2584
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/2494/
Executed test runs:
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build/3287/console
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/3315
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/3168/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/3168/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/3168/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/3168/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/3168/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/3168/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/3168/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/3168/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/3168/console

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

review: Needs Fixing (continuous-integration)

[lp:~josharenson/unity8/fix-session-icon]

2585. By Josh Arenson on 2016-11-16

Fix whitespace

[Unity8 CI Bot (unity8-ci-bot)]

FAILED: Continuous integration, rev:2585
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/2496/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build/3289
    UNSTABLE: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=vivid+overlay,testname=qmluitests.sh/1882
    UNSTABLE: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=qmluitests.sh/1882
    UNSTABLE: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=zesty,testname=qmluitests.sh/1882
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/3317
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/3170
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/3170/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/3170
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/3170/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/3170
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/3170/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/3170
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/3170/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/3170
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/3170/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/3170
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/3170/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/3170
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/3170/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/3170
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/3170/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/3170
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/3170/artifact/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)

[Unity8 CI Bot (unity8-ci-bot)]

FAILED: Continuous integration, rev:2585
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/2501/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build/3294
    UNSTABLE: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=vivid+overlay,testname=qmluitests.sh/1887
    UNSTABLE: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=qmluitests.sh/1887
    UNSTABLE: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=zesty,testname=qmluitests.sh/1887
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/3322
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/3175
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/3175/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/3175
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/3175/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/3175
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/3175/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/3175
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/3175/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/3175
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/3175/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/3175
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/3175/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/3175
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/3175/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/3175
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/3175/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/3175
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/3175/artifact/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)

=== modified file 'qml/Greeter/LoginList.qml'
--- qml/Greeter/LoginList.qml	2016-11-16 02:13:48 +0000
+++ qml/Greeter/LoginList.qml	2016-11-16 02:13:50 +0000
@@ -165,7 +165,7 @@
         }
 
         delegate: Item {
-            width: parent.width
+            width: userList.width
             height: root.cellHeight
 
             readonly property bool belowHighlight: (userList.currentIndex < 0 && index > 0) || (userList.currentIndex >= 0 && index > userList.currentIndex)

=== modified file 'qml/Greeter/WideView.qml'
--- qml/Greeter/WideView.qml	2016-11-16 02:13:48 +0000
+++ qml/Greeter/WideView.qml	2016-11-16 02:13:50 +0000
@@ -125,6 +125,8 @@
             id: loginList
             objectName: "loginList"
 
+            property int selectedUserIndex: 0
+
             width: units.gu(40)
             anchors {
                 left: parent.left
@@ -139,12 +141,30 @@
             Behavior on boxVerticalOffset { UbuntuNumberAnimation {} }
 
             model: root.userModel
-            currentSession: LightDM.Greeter.defaultSession
+            currentSession: LightDM.Users.data(selectedUserIndex,
+                                               LightDM.UserRoles.SessionRole);
             onResponded: root.responded(response)
-            onSelected: root.selected(index)
+            onSelected: {
+                if (LightDM.Users.mock) {
+                    LightDM.Users.mock.currentUsername = currentUser;
+                }
+
+                loginList.selectedUserIndex = index;
+                root.selected(index)
+            }
             onSessionChooserButtonClicked: parent.state = "SessionsList"
 
             Keys.forwardTo: [sessionChooserLoader.item]
+
+            // This is only for testing
+            Connections {
+                // TODO when Qt 5.7
+                //enabled: LightDM.Users.mock
+                target: LightDM.Users
+                onModelReset: {
+                    loginList.currentSession = LightDM.Users.data(loginList.selectedUserIndex, LightDM.UserRoles.SessionRole);
+                 }
+            }
         }
 
         Loader {

=== modified file 'tests/mocks/liblightdm/MockController.cpp'
--- tests/mocks/liblightdm/MockController.cpp	2016-11-16 02:13:48 +0000
+++ tests/mocks/liblightdm/MockController.cpp	2016-11-16 02:13:50 +0000
@@ -98,6 +98,30 @@
     }
 }
 
+QString MockController::sessionName() const
+{
+    return QString("INVALID - Please read directly from the UserModel");
+}
+
+void MockController::setSessionName(const QString &sessionName)
+{
+        // Let the user model deal with this
+        Q_EMIT sessionNameChanged(sessionName, m_currentUsername);
+}
+
+QString MockController::currentUsername() const
+{
+    return m_currentUsername;
+}
+
+void MockController::setCurrentUsername(const QString &username)
+{
+    if (m_currentUsername != username) {
+        m_currentUsername = username;
+        Q_EMIT currentUsernameChanged();
+    }
+}
+
 const QList<MockController::SessionItem> &MockController::fullSessionItems() const
 {
     return m_fullSessions;

=== modified file 'tests/mocks/liblightdm/MockController.h'
--- tests/mocks/liblightdm/MockController.h	2016-11-16 02:13:48 +0000
+++ tests/mocks/liblightdm/MockController.h	2016-11-16 02:13:50 +0000
@@ -35,6 +35,11 @@
     // single, none, full
     Q_PROPERTY(QString sessionMode READ sessionMode WRITE setSessionMode NOTIFY sessionModeChanged)
 
+    // This would be best as a Q_INVOKABLE, but using a property allows for
+    // keeping the mock cleaner
+    Q_PROPERTY(QString sessionName READ sessionName WRITE setSessionName NOTIFY sessionNameChanged)
+    Q_PROPERTY(QString currentUsername READ currentUsername WRITE setCurrentUsername NOTIFY currentUsernameChanged)
+
     Q_PROPERTY(int numAvailableSessions READ numFullSessions CONSTANT)
     Q_PROPERTY(int numSessions READ numSessions WRITE setNumSessions NOTIFY numSessionsChanged)
 
@@ -51,6 +56,12 @@
     QString sessionMode() const;
     void setSessionMode(const QString &sessionMode);
 
+    QString sessionName() const;
+    void setSessionName(const QString &sessionName);
+
+    QString currentUsername() const;
+    void setCurrentUsername(const QString &userIndex);
+
     class SessionItem
     {
     public:
@@ -64,14 +75,18 @@
     void setNumSessions(int numSessions);
 
 Q_SIGNALS:
+    void currentUsernameChanged();
     void selectUserHintChanged();
     void userModeChanged();
     void sessionModeChanged();
+    void sessionNameChanged(const QString &sessionName, const QString &username);
     void numSessionsChanged();
 
 private:
     explicit MockController(QObject* parent=0);
 
+    QString m_currentUsername;
+    QString m_sessionName;
     QString m_selectUserHint;
     QString m_userMode;
     QString m_sessionMode;

=== modified file 'tests/mocks/liblightdm/MockUsersModel.cpp'
--- tests/mocks/liblightdm/MockUsersModel.cpp	2016-11-16 02:13:48 +0000
+++ tests/mocks/liblightdm/MockUsersModel.cpp	2016-11-16 02:13:50 +0000
@@ -67,6 +67,8 @@
 
     connect(MockController::instance(), &MockController::userModeChanged,
             this, &UsersModel::resetEntries);
+    connect(MockController::instance(), &MockController::sessionNameChanged,
+            this, &UsersModel::setCurrentSessionName);
     resetEntries();
 }
 
@@ -75,6 +77,22 @@
     delete d_ptr;
 }
 
+void UsersModel::setCurrentSessionName(const QString &sessionName, const QString &username)
+{
+    Q_D(UsersModel);
+
+    beginResetModel();
+
+    for (auto &entry : d->entries) {
+        if (username == entry.username) {
+            entry.session = sessionName;
+            break;
+        }
+    }
+
+    endResetModel();
+}
+
 int UsersModel::rowCount(const QModelIndex &parent) const
 {
     Q_D(const UsersModel);
@@ -138,28 +156,33 @@
     } else if (userMode == "single-pin") {
         d->entries = {{"has-pin", "Has PIN", "", 0, false, false, "ubuntu", 0}};
     } else if (userMode == "full") {
+        /*
+         * Since the real model sorts these entries alphabetically, the model indices
+         * don't line up correctly. The easiest way to fix this is to ensure that this
+         * list of entries REMAINS IN ALPHABETICAL ORDER at all times.
+         */
         d->entries = {
+            { "active",            "Active Account", 0, 0, true, false, "ubuntu", 0 },
+            { "auth-error",        "Auth Error", 0, 0, false, false, "ubuntu", 0 },
+            { "black-background",  "Black Background", "#000000", 0, false, false, "ubuntu", 0 },
+            { "color-background",  "Color Background", "#E95420", 0, false, false, "ubuntu", 0 },
+            { "different-prompt",  "Different Prompt", 0, 0, false, false, "ubuntu", 0 },
+            { "empty-name",        "", 0, 0, false, false, "ubuntu", 0 },
             { "has-password",      "Has Password", 0, 0, false, false, "ubuntu", 0 },
             { "has-pin",           "Has PIN",      0, 0, false, false, "ubuntu", 0 },
-            { "different-prompt",  "Different Prompt", 0, 0, false, false, "ubuntu", 0 },
-            { "no-password",       "No Password", 0, 0, false, false, "ubuntu", 0 },
-            { "auth-error",        "Auth Error", 0, 0, false, false, "ubuntu", 0 },
-            { "two-factor",        "Two Factor", 0, 0, false, false, "ubuntu", 0 },
+            { "html-info-prompt",  "HTML Info Prompt", 0, 0, false, false, "ubuntu", 0 },
             { "info-prompt",       "Info Prompt", 0, 0, false, false, "ubuntu", 0 },
-            { "html-info-prompt",  "HTML Info Prompt", 0, 0, false, false, "ubuntu", 0 },
             { "long-info-prompt",  "Long Info Prompt", 0, 0, false, false, "ubuntu", 0 },
-            { "wide-info-prompt",  "Wide Info Prompt", 0, 0, false, false, "ubuntu", 0 },
+            { "long-name",         "Long name (far far too long to fit, seriously this would never fit on the screen, you will never see this part of the name)", 0, 0, false, false, "ubuntu", 0 },
             { "multi-info-prompt", "Multi Info Prompt", 0, 0, false, false, "ubuntu", 0 },
-            { "long-name",         "Long name (far far too long to fit, seriously this would never fit on the screen, you will never see this part of the name)", 0, 0, false, false, "ubuntu", 0 },
-            { "color-background",  "Color Background", "#E95420", 0, false, false, "ubuntu", 0 },
+            { "no-background",     "No Background", "", 0, false, false, "ubuntu", 0 },
+            { "no-password",       "No Password", 0, 0, false, false, "ubuntu", 0 },
+            { "no-response",       "No Response", 0, 0, false, false, "ubuntu", 0 },
+            { "two-factor",        "Two Factor", 0, 0, false, false, "ubuntu", 0 },
+            { "unicode",           "가나다라마", 0, 0, false, false, "ubuntu", 0 },
             // white and black are a bit redundant, but useful for manually testing if UI is still readable
             { "white-background",  "White Background", "#ffffff", 0, false, false, "ubuntu", 0 },
-            { "black-background",  "Black Background", "#000000", 0, false, false, "ubuntu", 0 },
-            { "no-background",     "No Background", "", 0, false, false, "ubuntu", 0 },
-            { "unicode",           "가나다라마", 0, 0, false, false, "ubuntu", 0 },
-            { "no-response",       "No Response", 0, 0, false, false, "ubuntu", 0 },
-            { "empty-name",        "", 0, 0, false, false, "ubuntu", 0 },
-            { "active",            "Active Account", 0, 0, true, false, "ubuntu", 0 },
+            { "wide-info-prompt",  "Wide Info Prompt", 0, 0, false, false, "ubuntu", 0 }
         };
     }
 

=== modified file 'tests/mocks/liblightdm/MockUsersModel.h'
--- tests/mocks/liblightdm/MockUsersModel.h	2016-11-16 02:13:48 +0000
+++ tests/mocks/liblightdm/MockUsersModel.h	2016-11-16 02:13:50 +0000
@@ -52,6 +52,8 @@
     int rowCount(const QModelIndex &parent) const override;
     QVariant data(const QModelIndex &index, int role) const override;
 
+    void setCurrentSessionName(const QString &sessionName, const QString &username);
+
     QObject *mock();
 
 private Q_SLOTS:

=== modified file 'tests/qmltests/Greeter/tst_WideView.qml'
--- tests/qmltests/Greeter/tst_WideView.qml	2016-11-16 02:13:48 +0000
+++ tests/qmltests/Greeter/tst_WideView.qml	2016-11-16 02:13:50 +0000
@@ -409,6 +409,23 @@
             waitForRendering(view);
         }
 
+        function test_changingSessionSticksToUser() {
+            LightDM.Sessions.mock.sessionMode = "full";
+            var loginList = findChild(view, "loginList");
+            var fakeSessionName = "ASessionWillNeverBeCalledThis"
+
+            compare(LightDM.Sessions.count > 1, true);
+            compare(loginList.currentSession != fakeSessionName, true);
+
+            LightDM.Users.mock.sessionName = fakeSessionName;
+            tryCompare(loginList, "currentSession", fakeSessionName);
+
+            // Force a model reset
+            LightDM.Users.mock.userMode = "single";
+            LightDM.Users.mock.userMode = "full";
+
+        }
+
         function test_tease_data() {
             return [
                 {tag: "locked", x: 0, offset: 0, count: 0, locked: true},