Merge lp:~dandrader/unity8/keepGreeterPwdUncovered into lp:unity8

[Daniel d'Andrada]

Ensure the greeter password field is not covered by the keyboard

This happens in tablet mode.

* 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?
Not applicable
 * If you changed the UI, has there been a design review?
Not applicable

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1570
http://jenkins.qa.ubuntu.com/job/unity8-ci/5185/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/966
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/349
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/350
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/350
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/856
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/964
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/964/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/17403

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/5185/rebuild

review: Needs Fixing (continuous-integration)

[lp:~dandrader/unity8/keepGreeterPwdUncovered]

1571. By Daniel d'Andrada on 2015-01-28

Remove debug left overs

[Albert Astals Cid (aacid)]

Personally i think a bit faster animation may be a better idea, but that's just my personal taste and i'm not the best person for these kind of UI decissions so just ignore :D

 * 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.
No, but only on unrelated known broken tests

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

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1571
http://jenkins.qa.ubuntu.com/job/unity8-ci/5199/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/1036
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/363
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/364
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/364
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/916
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1034
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1034/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/17545

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/5199/rebuild

review: Needs Fixing (continuous-integration)

[lp:~dandrader/unity8/keepGreeterPwdUncovered]

1572. By Daniel d'Andrada on 2015-02-02

Merge lp:~dandrader/unity8/unifyLightDMMocks

Unmerged revisions

=== modified file 'plugins/LightDM/CMakeLists.txt'
--- plugins/LightDM/CMakeLists.txt	2014-12-19 14:51:35 +0000
+++ plugins/LightDM/CMakeLists.txt	2015-02-02 14:28:47 +0000
@@ -4,6 +4,8 @@
 # TODO: Once we split out a separate greeter process, uncomment these lines
 #pkg_check_modules(LIBLIGHTDM REQUIRED liblightdm-qt5-2)
 
+add_subdirectory(liblightdm)
+
 include_directories(
     ${CMAKE_CURRENT_SOURCE_DIR}
     ${CMAKE_CURRENT_BINARY_DIR}
@@ -28,7 +30,7 @@
     )
 
 target_link_libraries(LightDM-qml
-    MockLightDM-demo
+    integratedLightDM
     unity8-private
 # TODO: Once we split out a separate greeter process, uncomment these lines
 #    ${LIBLIGHTDM_LDFLAGS}

=== modified file 'plugins/LightDM/Greeter.cpp'
--- plugins/LightDM/Greeter.cpp	2014-10-09 14:53:00 +0000
+++ plugins/LightDM/Greeter.cpp	2015-02-02 14:28:47 +0000
@@ -17,26 +17,8 @@
  */
 
 #include "Greeter.h"
+#include "GreeterPrivate.h"
 #include <libintl.h>
-#include <QLightDM/Greeter>
-
-class GreeterPrivate
-{
-public:
-    explicit GreeterPrivate(Greeter *parent);
-
-    QLightDM::Greeter *m_greeter;
-    bool m_active;
-    bool wasPrompted;
-    bool promptless;
-
-protected:
-    Greeter * const q_ptr;
-
-private:
-    Q_DECLARE_PUBLIC(Greeter)
-};
-
 
 GreeterPrivate::GreeterPrivate(Greeter* parent)
   : m_greeter(new QLightDM::Greeter(parent)),

=== modified file 'plugins/LightDM/Greeter.h'
--- plugins/LightDM/Greeter.h	2014-10-09 14:53:00 +0000
+++ plugins/LightDM/Greeter.h	2015-02-02 14:28:47 +0000
@@ -68,7 +68,7 @@
     // should switch to this user if possible.
     void requestAuthenticationUser(const QString &user);
 
-private:
+protected:
     GreeterPrivate * const d_ptr;
 
     Q_DECLARE_PRIVATE(Greeter)

=== added file 'plugins/LightDM/GreeterPrivate.h'
--- plugins/LightDM/GreeterPrivate.h	1970-01-01 00:00:00 +0000
+++ plugins/LightDM/GreeterPrivate.h	2015-02-02 14:28:47 +0000
@@ -0,0 +1,39 @@
+/*
+ * Copyright (C) 2014 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef UNITY_GREETER_PRIVATE_H
+#define UNITY_GREETER_PRIVATE_H
+
+#include <QLightDM/Greeter>
+
+class GreeterPrivate
+{
+public:
+    explicit GreeterPrivate(Greeter *parent);
+
+    QLightDM::Greeter *m_greeter;
+    bool m_active;
+    bool wasPrompted;
+    bool promptless;
+
+protected:
+    Greeter * const q_ptr;
+
+private:
+    Q_DECLARE_PUBLIC(Greeter)
+};
+
+#endif // UNITY_GREETER_PRIVATE_H

=== added directory 'plugins/LightDM/liblightdm'
=== added file 'plugins/LightDM/liblightdm/CMakeLists.txt'
--- plugins/LightDM/liblightdm/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ plugins/LightDM/liblightdm/CMakeLists.txt	2015-02-02 14:28:47 +0000
@@ -0,0 +1,37 @@
+pkg_check_modules(LIBUSERMETRICSOUTPUT REQUIRED libusermetricsoutput-1)
+
+set(LibLightDM_SOURCES
+    Greeter.cpp
+    UsersModel.cpp
+    GreeterPrivate.cpp
+    UsersModelPrivate.cpp
+    ${CMAKE_SOURCE_DIR}/plugins/Utils/qvariantlistmodel.cpp
+    )
+
+add_library(integratedLightDM STATIC ${LibLightDM_SOURCES})
+add_library(MockLightDM-demo-shared SHARED ${LibLightDM_SOURCES})
+
+include_directories(
+    ${CMAKE_CURRENT_BINARY_DIR}
+    ${LIBUSERMETRICSOUTPUT_INCLUDE_DIRS}
+)
+
+target_link_libraries(integratedLightDM
+    ${LIBUSERMETRICSOUTPUT_LDFLAGS}
+    -lpam
+)
+target_link_libraries(MockLightDM-demo-shared
+    ${LIBUSERMETRICSOUTPUT_LDFLAGS}
+    -lpam
+)
+
+qt5_use_modules(integratedLightDM Concurrent Gui)
+qt5_use_modules(MockLightDM-demo-shared Concurrent Gui)
+
+set_target_properties(integratedLightDM PROPERTIES COMPILE_FLAGS -fPIC)
+set_target_properties(MockLightDM-demo-shared PROPERTIES
+                      OUTPUT_NAME lightdm-qt5-2)
+
+install(TARGETS MockLightDM-demo-shared
+    DESTINATION ${SHELL_INSTALL_QML}/mocks/LightDM/demo
+    )

=== added file 'plugins/LightDM/liblightdm/Greeter.cpp'
--- plugins/LightDM/liblightdm/Greeter.cpp	1970-01-01 00:00:00 +0000
+++ plugins/LightDM/liblightdm/Greeter.cpp	2015-02-02 14:28:47 +0000
@@ -0,0 +1,184 @@
+/*
+ * Copyright (C) 2013 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Author: Michael Terry <[e-mail]>
+ */
+
+
+/* !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+ * CHANGES MADE HERE MUST BE REFLECTED ON THE MOCK LIB
+ * COUNTERPART IN tests/mocks/Lightdm/liblightdm
+ * !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! */
+
+
+#include "Greeter.h"
+#include "GreeterPrivate.h"
+#include <QtCore/QCoreApplication>
+#include <QTimer>
+
+namespace QLightDM
+{
+
+Greeter::Greeter(QObject *parent)
+  : QObject(parent),
+    d_ptr(new GreeterPrivate(this))
+{
+}
+
+Greeter::~Greeter()
+{
+}
+
+QString Greeter::authenticationUser() const
+{
+    Q_D(const Greeter);
+    return d->authenticationUser;
+}
+
+bool Greeter::hasGuestAccountHint() const
+{
+    return true;
+}
+
+QString Greeter::getHint(const QString &name) const
+{
+    Q_UNUSED(name)
+    return "";
+}
+
+QString Greeter::defaultSessionHint() const
+{
+    return "ubuntu";
+}
+
+bool Greeter::hideUsersHint() const
+{
+    return false;
+}
+
+bool Greeter::showManualLoginHint() const
+{
+    return true;
+}
+
+bool Greeter::showRemoteLoginHint() const
+{
+    return true;
+}
+
+bool Greeter::lockHint () const
+{
+    return false;
+}
+
+QString Greeter::selectUserHint() const
+{
+    return "";
+}
+
+bool Greeter::selectGuestHint() const
+{
+    return false;
+}
+
+QString Greeter::autologinUserHint() const
+{
+    return "";
+}
+
+bool Greeter::autologinGuestHint() const
+{
+    return false;
+}
+
+int Greeter::autologinTimeoutHint() const
+{
+    return 0;
+}
+
+bool Greeter::inAuthentication() const
+{
+    return false;
+}
+
+QString Greeter::hostname() const
+{
+    return "hostname1";
+}
+
+bool Greeter::isAuthenticated() const
+{
+    Q_D(const Greeter);
+    return d->authenticated;
+}
+
+bool Greeter::connectSync()
+{
+    return true;
+}
+
+void Greeter::authenticate(const QString &username)
+{
+    Q_D(Greeter);
+
+    d->authenticated = false;
+    d->authenticationUser = username;
+    d->handleAuthenticate();
+}
+
+void Greeter::authenticateAsGuest()
+{}
+
+void Greeter::authenticateAutologin()
+{}
+
+void Greeter::authenticateRemote(const QString &session, const QString &username)
+{
+    Q_UNUSED(session)
+    Q_UNUSED(username)
+}
+
+void Greeter::cancelAuthentication()
+{}
+
+void Greeter::setLanguage (const QString &language)
+{
+    Q_UNUSED(language)
+}
+
+bool Greeter::startSessionSync(const QString &session)
+{
+    Q_UNUSED(session)
+    return true;
+}
+
+void Greeter::respond(const QString &response)
+{
+    Q_D(Greeter);
+
+    d->handleRespond(response);
+}
+
+void Greeter::sendAuthenticationComplete()
+{
+    if (qgetenv("UNITY_TESTING").isEmpty()) {
+        // simulate PAM's delay
+        QTimer::singleShot(1000, this, SIGNAL(authenticationComplete()));
+    } else {
+        Q_EMIT authenticationComplete();
+    }
+}
+
+}

=== added file 'plugins/LightDM/liblightdm/Greeter.h'
--- plugins/LightDM/liblightdm/Greeter.h	1970-01-01 00:00:00 +0000
+++ plugins/LightDM/liblightdm/Greeter.h	2015-02-02 14:28:47 +0000
@@ -0,0 +1,112 @@
+/*
+ * Copyright (C) 2013 Canonical, Ltd.
+ * Copyright (C) 2010-2011 David Edmundson.
+ * Copyright (C) 2010-2011 Robert Ancell
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Author: David Edmundson <[e-mail]>
+ */
+
+#ifndef UNITY_MOCK_GREETER_H
+#define UNITY_MOCK_GREETER_H
+
+#include <QtCore/QObject>
+#include <QtCore/QVariant>
+
+/* !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+ * CHANGES MADE HERE MUST BE REFLECTED ON THE MOCK LIB
+ * COUNTERPART IN tests/mocks/Lightdm/liblightdm
+ * !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! */
+
+namespace QLightDM
+{
+    class GreeterPrivate;
+
+class Q_DECL_EXPORT Greeter : public QObject
+{
+    Q_OBJECT
+
+    Q_PROPERTY(bool authenticated READ isAuthenticated ) //NOTFIY authenticationComplete
+    Q_PROPERTY(QString authenticationUser READ authenticationUser )
+    Q_PROPERTY(QString defaultSession READ defaultSessionHint CONSTANT)
+    Q_PROPERTY(QString selectUser READ selectUserHint CONSTANT)
+    Q_PROPERTY(bool selectGuest READ selectGuestHint CONSTANT)
+
+    Q_PROPERTY(QString hostname READ hostname CONSTANT)
+    Q_PROPERTY(bool hasGuestAccount READ hasGuestAccountHint CONSTANT)
+    Q_PROPERTY(bool locked READ lockHint CONSTANT)
+
+    Q_PROPERTY(QString hostname READ hostname CONSTANT)
+
+    Q_ENUMS(PromptType MessageType)
+
+public:
+    enum PromptType {
+        PromptTypeQuestion,
+        PromptTypeSecret
+    };
+
+    enum MessageType {
+        MessageTypeInfo,
+        MessageTypeError
+    };
+
+    explicit Greeter(QObject* parent=0);
+    virtual ~Greeter();
+
+    QString getHint(const QString &name) const;
+    QString defaultSessionHint() const;
+    bool hideUsersHint() const;
+    bool showManualLoginHint() const;
+    bool showRemoteLoginHint() const;
+    bool lockHint () const;
+    bool hasGuestAccountHint() const;
+    QString selectUserHint() const;
+    bool selectGuestHint() const;
+    QString autologinUserHint() const;
+    bool autologinGuestHint() const;
+    int autologinTimeoutHint() const;
+
+    bool inAuthentication() const;
+    bool isAuthenticated() const;
+    QString authenticationUser() const;
+    QString hostname() const;
+
+public Q_SLOTS:
+    bool connectSync();
+    void authenticate(const QString &username=QString());
+    void authenticateAsGuest();
+    void authenticateAutologin();
+    void authenticateRemote(const QString &session=QString(), const QString &username=QString());
+    void respond(const QString &response);
+    void cancelAuthentication();
+    void setLanguage (const QString &language);
+    bool startSessionSync(const QString &session=QString());
+
+Q_SIGNALS:
+    void showMessage(QString text, QLightDM::Greeter::MessageType type);
+    void showPrompt(QString text, QLightDM::Greeter::PromptType type);
+    void authenticationComplete();
+    void autologinTimerExpired();
+
+protected:
+    void sendAuthenticationComplete();
+
+private:
+    GreeterPrivate *d_ptr;
+    Q_DECLARE_PRIVATE(Greeter)
+};
+}
+
+#endif // UNITY_MOCK_GREETER_H

=== added file 'plugins/LightDM/liblightdm/GreeterPrivate.cpp'
--- plugins/LightDM/liblightdm/GreeterPrivate.cpp	1970-01-01 00:00:00 +0000
+++ plugins/LightDM/liblightdm/GreeterPrivate.cpp	2015-02-02 14:28:47 +0000
@@ -0,0 +1,281 @@
+/*
+ * Copyright (C) 2013 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Author: Michael Terry <[e-mail]>
+ */
+
+#include "Greeter.h"
+#include "GreeterPrivate.h"
+#include <QFuture>
+#include <QFutureInterface>
+#include <QFutureWatcher>
+#include <QQueue>
+#include <QtConcurrent>
+#include <QVector>
+#include <security/pam_appl.h>
+
+namespace QLightDM
+{
+
+class GreeterImpl : public QObject
+{
+    Q_OBJECT
+
+    struct AppData
+    {
+        GreeterImpl *impl;
+        pam_handle *handle;
+    };
+
+    typedef QFutureInterface<QString> ResponseFuture;
+
+public:
+    explicit GreeterImpl(Greeter *parent, GreeterPrivate *greeterPrivate)
+        : QObject(parent),
+          greeter(parent),
+          greeterPrivate(greeterPrivate),
+          pamHandle(nullptr)
+    {
+        qRegisterMetaType<QLightDM::GreeterImpl::ResponseFuture>("QLightDM::GreeterImpl::ResponseFuture");
+
+        connect(&futureWatcher, SIGNAL(finished()),
+                this, SLOT(finishPam()));
+        connect(this, SIGNAL(showMessage(pam_handle *, QString, QLightDM::Greeter::MessageType)),
+                this, SLOT(handleMessage(pam_handle *, QString, QLightDM::Greeter::MessageType)));
+        // This next connect is how we pass ResponseFutures between threads
+        connect(this, SIGNAL(showPrompt(pam_handle *, QString, QLightDM::Greeter::PromptType, QLightDM::GreeterImpl::ResponseFuture)),
+                this, SLOT(handlePrompt(pam_handle *, QString, QLightDM::Greeter::PromptType, QLightDM::GreeterImpl::ResponseFuture)));
+    }
+
+    ~GreeterImpl()
+    {
+        cancelPam();
+    }
+
+    void start(QString username)
+    {
+        // Clear out any existing PAM interactions first
+        cancelPam();
+
+        AppData *appData = new AppData();
+        appData->impl = this;
+
+        // Now actually start a new conversation with PAM
+        pam_conv conversation;
+        conversation.conv = converseWithPam;
+        conversation.appdata_ptr = static_cast<void*>(appData);
+
+        if (pam_start("lightdm", username.toUtf8(), &conversation, &pamHandle) == PAM_SUCCESS) {
+            appData->handle = pamHandle;
+            futureWatcher.setFuture(QtConcurrent::run(authenticateWithPam, pamHandle));
+        } else {
+            delete appData;
+            greeterPrivate->authenticated = false;
+            Q_EMIT greeter->showMessage("Internal error: could not start PAM authentication", QLightDM::Greeter::MessageTypeError);
+            Q_EMIT greeter->authenticationComplete();
+        }
+    }
+
+    static int authenticateWithPam(pam_handle* pamHandle)
+    {
+        int pamStatus = pam_authenticate(pamHandle, 0);
+        if (pamStatus == PAM_SUCCESS) {
+            pamStatus = pam_acct_mgmt(pamHandle, 0);
+        }
+        if (pamStatus == PAM_NEW_AUTHTOK_REQD) {
+            pamStatus = pam_chauthtok(pamHandle, PAM_CHANGE_EXPIRED_AUTHTOK);
+        }
+        if (pamStatus == PAM_SUCCESS) {
+            pam_setcred(pamHandle, PAM_REINITIALIZE_CRED);
+        }
+        return pamStatus;
+    }
+
+    static int converseWithPam(int num_msg, const pam_message** msg,
+                               pam_response** resp, void* appdata_ptr)
+    {
+        if (num_msg <= 0)
+            return PAM_CONV_ERR;
+
+        auto* tmp_response = static_cast<pam_response*>(calloc(num_msg, sizeof(pam_response)));
+        if (!tmp_response)
+            return PAM_CONV_ERR;
+
+        AppData *appData = static_cast<AppData*>(appdata_ptr);
+        GreeterImpl *impl = appData->impl;
+        pam_handle *handle = appData->handle;
+
+        int count;
+        QVector<ResponseFuture> responses;
+
+        for (count = 0; count < num_msg; ++count)
+        {
+            switch (msg[count]->msg_style)
+            {
+            case PAM_PROMPT_ECHO_ON:
+            {
+                QString message(msg[count]->msg);
+                responses.append(ResponseFuture());
+                responses.last().reportStarted();
+                Q_EMIT impl->showPrompt(handle, message, Greeter::PromptTypeQuestion, responses.last());
+                break;
+            }
+            case PAM_PROMPT_ECHO_OFF:
+            {
+                QString message(msg[count]->msg);
+                responses.append(ResponseFuture());
+                responses.last().reportStarted();
+                Q_EMIT impl->showPrompt(handle, message, Greeter::PromptTypeSecret, responses.last());
+                break;
+            }
+            case PAM_TEXT_INFO:
+            {
+                QString message(msg[count]->msg);
+                Q_EMIT impl->showMessage(handle, message, Greeter::MessageTypeInfo);
+                break;
+            }
+            default:
+            {
+                QString message(msg[count]->msg);
+                Q_EMIT impl->showMessage(handle, message, Greeter::MessageTypeError);
+                break;
+            }
+            }
+        }
+
+        int i = 0;
+        bool raise_error = false;
+
+        for (auto &response : responses)
+        {
+            pam_response* resp_item = &tmp_response[i++];
+            resp_item->resp_retcode = 0;
+            resp_item->resp = strdup(response.future().result().toUtf8());
+
+            if (!resp_item->resp)
+            {
+                raise_error = true;
+                break;
+            }
+        }
+
+        delete appData;
+
+        if (raise_error)
+        {
+            for (int i = 0; i < count; ++i)
+                free(tmp_response[i].resp);
+
+            free(tmp_response);
+            return PAM_CONV_ERR;
+        }
+        else
+        {
+            *resp = tmp_response;
+            return PAM_SUCCESS;
+        }
+    }
+
+public Q_SLOTS:
+    bool respond(QString response)
+    {
+        if (!futures.isEmpty()) {
+            futures.dequeue().reportFinished(&response);
+            return true;
+        } else {
+            return false;
+        }
+    }
+
+Q_SIGNALS:
+    void showMessage(pam_handle *handle, QString text, QLightDM::Greeter::MessageType type);
+    void showPrompt(pam_handle *handle, QString text, QLightDM::Greeter::PromptType type, QLightDM::GreeterImpl::ResponseFuture response);
+
+private Q_SLOTS:
+    void finishPam()
+    {
+        if (pamHandle == nullptr) {
+            return;
+        }
+
+        int pamStatus = futureWatcher.result();
+
+        pam_end(pamHandle, pamStatus);
+        pamHandle = nullptr;
+
+        greeterPrivate->authenticated = (pamStatus == PAM_SUCCESS);
+        Q_EMIT greeter->authenticationComplete();
+    }
+
+    void handleMessage(pam_handle *handle, QString text, QLightDM::Greeter::MessageType type)
+    {
+        if (handle != pamHandle)
+            return;
+
+        Q_EMIT greeter->showMessage(text, type);
+    }
+
+    void handlePrompt(pam_handle *handle, QString text, QLightDM::Greeter::PromptType type, QLightDM::GreeterImpl::ResponseFuture future)
+    {
+        if (handle != pamHandle) {
+            future.reportResult(QString());
+            future.reportFinished();
+            return;
+        }
+
+        futures.enqueue(future);
+        Q_EMIT greeter->showPrompt(text, type);
+    }
+
+private:
+    void cancelPam()
+    {
+        // Unfortunately we can't simply cancel our QFuture because QtConcurrent::run doesn't support cancel
+        if (pamHandle != nullptr) {
+            pam_handle *handle = pamHandle;
+            pamHandle = nullptr; // to disable normal finishPam() handling
+            while (respond(QString())); // clear our local queue of QFutures
+            pam_end(handle, PAM_CONV_ERR);
+        }
+    }
+
+    Greeter *greeter;
+    GreeterPrivate *greeterPrivate;
+    pam_handle* pamHandle;
+    QFutureWatcher<int> futureWatcher;
+    QQueue<ResponseFuture> futures;
+};
+
+GreeterPrivate::GreeterPrivate(Greeter* parent)
+  : authenticated(false),
+    authenticationUser(),
+    m_impl(new GreeterImpl(parent, this)),
+    q_ptr(parent)
+{
+}
+
+void GreeterPrivate::handleAuthenticate()
+{
+    m_impl->start(authenticationUser);
+}
+
+void GreeterPrivate::handleRespond(const QString &response)
+{
+    m_impl->respond(response);
+}
+
+}
+
+#include "GreeterPrivate.moc"

=== added file 'plugins/LightDM/liblightdm/GreeterPrivate.h'
--- plugins/LightDM/liblightdm/GreeterPrivate.h	1970-01-01 00:00:00 +0000
+++ plugins/LightDM/liblightdm/GreeterPrivate.h	2015-02-02 14:28:47 +0000
@@ -0,0 +1,51 @@
+/*
+ * Copyright (C) 2013 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Author: Michael Terry <[e-mail]>
+ */
+
+#ifndef UNITY_MOCK_GREETER_PRIVATE_H
+#define UNITY_MOCK_GREETER_PRIVATE_H
+
+#include <QtCore/QObject>
+
+namespace QLightDM
+{
+class Greeter;
+class GreeterImpl;
+
+class GreeterPrivate
+{
+public:
+    explicit GreeterPrivate(Greeter* parent=0);
+    virtual ~GreeterPrivate() = default;
+
+    // These variables may not be used by all subclasses, that's no problem
+    bool authenticated;
+    QString authenticationUser;
+
+    void handleAuthenticate();
+    void handleRespond(const QString &response);
+
+protected:
+    GreeterImpl *m_impl; // if the backend needs more private data
+    Greeter * const q_ptr;
+
+private:
+    Q_DECLARE_PUBLIC(Greeter)
+};
+}
+
+#endif // UNITY_MOCK_GREETER_PRIVATE_H

=== added file 'plugins/LightDM/liblightdm/UsersModel.cpp'
--- plugins/LightDM/liblightdm/UsersModel.cpp	1970-01-01 00:00:00 +0000
+++ plugins/LightDM/liblightdm/UsersModel.cpp	2015-02-02 14:28:47 +0000
@@ -0,0 +1,123 @@
+/*
+ * Copyright (C) 2013 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Author: Michael Terry <[e-mail]>
+ */
+
+
+/* !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+ * CHANGES MADE HERE MUST BE REFLECTED ON THE MOCK LIB
+ * COUNTERPART IN tests/mocks/Lightdm/liblightdm
+ * !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! */
+
+// LightDM currently is Qt4 compatible, and so doesn't define setRoleNames.
+// To use the same method of setting role name that it does, we
+// set our compatibility to Qt4 here too.
+#define QT_DISABLE_DEPRECATED_BEFORE QT_VERSION_CHECK(4, 0, 0)
+
+#include "UsersModel.h"
+#include "UsersModelPrivate.h"
+#include <QtCore/QDir>
+#include <QtCore/QString>
+#include <QtGui/QIcon>
+
+namespace QLightDM
+{
+
+UsersModel::UsersModel(QObject *parent) :
+    QAbstractListModel(parent),
+    d_ptr(new UsersModelPrivate(this))
+{
+    Q_D(UsersModel);
+
+    // Extend roleNames (we want to keep the "display" role)
+    QHash<int, QByteArray> roles = roleNames();
+    roles[NameRole] = "name";
+    roles[RealNameRole] = "realName";
+    roles[LoggedInRole] = "loggedIn";
+    roles[BackgroundRole] = "background";
+    roles[BackgroundPathRole] = "backgroundPath";
+    roles[SessionRole] = "session";
+    roles[HasMessagesRole] = "hasMessages";
+    roles[ImagePathRole] = "imagePath";
+    setRoleNames(roles);
+
+    // Now modify our mock user backgrounds
+    QDir bgdir = QDir("/usr/share/demo-assets/shell/backgrounds/");
+    QStringList backgrounds = bgdir.entryList(QDir::Files | QDir::NoDotAndDotDot);
+
+    for (int i = 0, j = 0; i < d->entries.size(); i++) {
+        Entry &entry = d->entries[i];
+        if (entry.background.isNull() && !backgrounds.isEmpty()) {
+            entry.background = bgdir.filePath(backgrounds[j++]);
+            if (j >= backgrounds.length()) {
+                j = 0;
+            }
+        }
+    }
+}
+
+UsersModel::~UsersModel()
+{
+    delete d_ptr;
+}
+
+int UsersModel::rowCount(const QModelIndex &parent) const
+{
+    Q_D(const UsersModel);
+
+    if (parent.isValid()) {
+        return 0;
+    } else { // parent is root
+        return d->entries.size();
+    }
+}
+
+QVariant UsersModel::data(const QModelIndex &index, int role) const
+{
+    Q_D(const UsersModel);
+
+    if (!index.isValid()) {
+        return QVariant();
+    }
+
+    int row = index.row();
+    switch (role) {
+    case Qt::DisplayRole:
+        return d->entries[row].real_name;
+    case Qt::DecorationRole:
+        return QIcon();
+    case UsersModel::NameRole:
+        return d->entries[row].username;
+    case UsersModel::RealNameRole:
+        return d->entries[row].real_name;
+    case UsersModel::SessionRole:
+        return d->entries[row].session;
+    case UsersModel::LoggedInRole:
+        return d->entries[row].is_active;
+    case UsersModel::BackgroundRole:
+        return QPixmap(d->entries[row].background);
+    case UsersModel::BackgroundPathRole:
+        return d->entries[row].background;
+    case UsersModel::HasMessagesRole:
+        return d->entries[row].has_messages;
+    case UsersModel::ImagePathRole:
+        return "";
+    default:
+        return QVariant();
+    }
+}
+
+}

=== added file 'plugins/LightDM/liblightdm/UsersModel.h'
--- plugins/LightDM/liblightdm/UsersModel.h	1970-01-01 00:00:00 +0000
+++ plugins/LightDM/liblightdm/UsersModel.h	2015-02-02 14:28:47 +0000
@@ -0,0 +1,66 @@
+/*
+ * Copyright (C) 2013 Canonical, Ltd.
+ * Copyright (C) 2010-2011 David Edmundson.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Author: David Edmundson <[e-mail]>
+ */
+
+#ifndef UNITY_MOCK_USERSMODEL_H
+#define UNITY_MOCK_USERSMODEL_H
+
+#include <QtCore/QString>
+#include <QtCore/QSharedDataPointer>
+#include <QAbstractListModel>
+
+/* !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+ * CHANGES MADE HERE MUST BE REFLECTED ON THE MOCK LIB
+ * COUNTERPART IN tests/mocks/Lightdm/liblightdm
+ * !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! */
+
+namespace QLightDM
+{
+class UsersModelPrivate;
+
+class Q_DECL_EXPORT UsersModel : public QAbstractListModel
+{
+    Q_OBJECT
+
+    Q_ENUMS(UserModelRoles)
+
+public:
+    explicit UsersModel(QObject *parent = 0);
+    virtual ~UsersModel();
+
+    enum UserModelRoles {NameRole = Qt::UserRole,
+                         RealNameRole,
+                         LoggedInRole,
+                         BackgroundRole,
+                         SessionRole,
+                         HasMessagesRole,
+                         ImagePathRole,
+                         BackgroundPathRole
+    };
+
+    int rowCount(const QModelIndex &parent) const;
+    QVariant data(const QModelIndex &index, int role) const;
+
+private:
+    UsersModelPrivate * const d_ptr;
+    Q_DECLARE_PRIVATE(UsersModel)
+};
+
+}
+
+#endif // UNITY_MOCK_USERSMODEL_H

=== added file 'plugins/LightDM/liblightdm/UsersModelPrivate.cpp'
--- plugins/LightDM/liblightdm/UsersModelPrivate.cpp	1970-01-01 00:00:00 +0000
+++ plugins/LightDM/liblightdm/UsersModelPrivate.cpp	2015-02-02 14:28:47 +0000
@@ -0,0 +1,41 @@
+/*
+ * Copyright (C) 2013 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Author: Michael Terry <[e-mail]>
+ */
+
+#include "UsersModelPrivate.h"
+
+#include <QDir>
+#include <QSettings>
+#include <QStringList>
+
+namespace QLightDM
+{
+
+UsersModelPrivate::UsersModelPrivate(UsersModel* parent)
+  : q_ptr(parent)
+{
+    QSettings settings(QDir::homePath() + "/.unity8-greeter-demo", QSettings::NativeFormat);
+    QStringList users = settings.value("users", QStringList() << qgetenv("USER")).toStringList();
+
+    Q_FOREACH(const QString &user, users)
+    {
+        QString name = settings.value(user + "/name", user[0].toUpper() + user.mid(1)).toString();
+        entries.append({user, name, 0, 0, false, false, 0, 0});
+    }
+}
+
+}

=== added file 'plugins/LightDM/liblightdm/UsersModelPrivate.h'
--- plugins/LightDM/liblightdm/UsersModelPrivate.h	1970-01-01 00:00:00 +0000
+++ plugins/LightDM/liblightdm/UsersModelPrivate.h	2015-02-02 14:28:47 +0000
@@ -0,0 +1,59 @@
+/*
+ * Copyright (C) 2013 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Author: Michael Terry <[e-mail]>
+ */
+
+#ifndef UNITY_MOCK_USERSMODEL_PRIVATE_H
+#define UNITY_MOCK_USERSMODEL_PRIVATE_H
+
+#include <QtCore/QList>
+#include <QtCore/QString>
+
+namespace QLightDM
+{
+class UsersModel;
+
+class Entry
+{
+public:
+    QString username;
+    QString real_name;
+    QString background;
+    QString layouts;
+    bool is_active;
+    bool has_messages;
+    QString session;
+    QString infographic;
+};
+
+class UsersModelPrivate
+{
+public:
+    explicit UsersModelPrivate(UsersModel *parent = 0);
+    virtual ~UsersModelPrivate() = default;
+
+    QList<Entry> entries;
+
+protected:
+    UsersModel * const q_ptr;
+
+private:
+    Q_DECLARE_PUBLIC(UsersModel)
+};
+
+}
+
+#endif // UNITY_MOCK_USERSMODEL_PRIVATE_H

=== modified file 'qml/Greeter/Greeter.qml'
--- qml/Greeter/Greeter.qml	2015-01-09 10:41:28 +0000
+++ qml/Greeter/Greeter.qml	2015-02-02 14:28:47 +0000
@@ -30,6 +30,9 @@
 
     property url background
 
+    // so that it can be replaced in tests with a mock object
+    property var inputMethod: Qt.inputMethod
+
     prepareToHide: function () {
         hideTranslation.to = greeter.x > 0 || d.forceRightOnNextHideAnimation ? greeter.width : -greeter.width;
         d.forceRightOnNextHideAnimation = false;
@@ -102,6 +105,11 @@
             }
             onUnlocked: greeter.unlocked(uid);
         }
+        Binding {
+            target: greeterContentLoader.item
+            property: "inputMethod"
+            value: greeter.inputMethod
+        }
     }
 
     DragHandle {

=== modified file 'qml/Greeter/GreeterContent.qml'
--- qml/Greeter/GreeterContent.qml	2014-12-11 17:32:14 +0000
+++ qml/Greeter/GreeterContent.qml	2015-02-02 14:28:47 +0000
@@ -24,6 +24,8 @@
     id: root
     anchors.fill: parent
 
+    property var inputMethod
+
     property bool ready: background.source == "" || background.status == Image.Ready || background.status == Image.Error
 
     signal selected(int uid)
@@ -74,10 +76,12 @@
         anchors {
             left: parent.left
             leftMargin: Math.min(parent.width * 0.16, units.gu(20))
-            verticalCenter: parent.verticalCenter
+            top: parent.top
         }
         width: units.gu(29)
-        height: parent.height
+        height: inputMethod && inputMethod.visible ? parent.height - inputMethod.keyboardRectangle.height
+                                                   : parent.height
+        Behavior on height { UbuntuNumberAnimation {} }
 
         // TODO: Once we have a system API for determining which mode we are
         // in, tablet/phone/desktop, that should be used instead of narrowMode.

=== modified file 'run.sh'
--- run.sh	2015-01-20 16:21:07 +0000
+++ run.sh	2015-02-02 14:28:47 +0000
@@ -6,8 +6,6 @@
 QML_PHONE_SHELL_PATH=./builddir/src/unity8
 GDB=false
 FAKE=false
-PINLOCK=false
-KEYLOCK=false
 USE_MOCKS=false
 MOUSE_TOUCH=true
 
@@ -16,9 +14,6 @@
     echo "Script to run the shell.\n" >&2
     echo "OPTIONS:" >&2
     echo " -f, --fake Force use of fake Qml modules." >&2
-    echo " -p, --pinlock Use a pin protected user." >&2
-    echo " -k, --keylock Use a passphrase protected user." >&2
-    echo " -l, --lightdm Use the specified lightdm mock." >&2
     echo " -g, --gdb Run through gdb." >&2
     echo " -h, --help Show this help." >&2
     echo " -m, --nomousetouch Run without -mousetouch argument." >&2
@@ -26,7 +21,7 @@
     exit 1
 }
 
-ARGS=`getopt -n$0 -u -a --longoptions="fake,pinlock,keylock,gdb,help,lightdm:,nomousetouch" -o "fpkl:ghm" -- "$@"`
+ARGS=`getopt -n$0 -u -a --longoptions="fake,gdb,help:,nomousetouch" -o "fghm" -- "$@"`
 [ $? -ne 0 ] && usage
 eval set -- "$ARGS"
 
@@ -34,12 +29,6 @@
 do
     case "$1" in
        -f|--fake)     USE_MOCKS=true;;
-       -p|--pinlock)  USE_MOCKS=true; LIGHTDM_MOCK=single-pin;;
-       -k|--keylock)  USE_MOCKS=true; LIGHTDM_MOCK=single-passphrase;;
-       -l|--lightdm)  LIGHTDM_MOCK=$2; shift;
-                      if [ -z "$LIGHTDM_MOCK" ]; then
-                        echo "Please specify an argument to --lightdm"
-                      fi;;
        -g|--gdb)   GDB=true;;
        -h|--help)  usage;;
        -m|--nomousetouch)  MOUSE_TOUCH=false;;
@@ -48,23 +37,11 @@
     shift
 done
 
-if [ -z "$LIGHTDM_MOCK" ]; then
-  LIGHTDM_MOCK=single
-fi
-
-# Even without USE_MOCKS set, we want to fake our lightdm backend, because it's
-# annoying to be prompted for your password when testing.  To get the same
-# backend used in production, pass '--lightdm=demo'.
-export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$PWD/builddir/tests/mocks/LightDM/$LIGHTDM_MOCK
-
 if $USE_MOCKS; then
-  rm -f $PWD/builddir/nonmirplugins/LightDM # undo symlink (from below) for cleanliness
   export QML2_IMPORT_PATH=$QML2_IMPORT_PATH:$PWD/builddir/tests/mocks:$PWD/builddir/plugins:$PWD/builddir/modules
-  export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$PWD/builddir/tests/mocks/libusermetrics:$PWD/builddir/tests/mocks/QMenuModel
+  export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$PWD/builddir/tests/mocks/LightDM/liblightdm:$PWD/builddir/tests/mocks/libusermetrics:$PWD/builddir/tests/mocks/QMenuModel
 else
-  # Just link our LightDM mock into the nonmirplugins folder.  We don't want
-  # the rest of our plugins to be used.
-  ln -sf $PWD/builddir/tests/mocks/LightDM $PWD/builddir/nonmirplugins/
+  export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$PWD/builddir/plugins/LightDM/liblightdm
 fi
 
 QML_PHONE_SHELL_ARGS=""

=== modified file 'tests/autopilot/unity8/shell/__init__.py'
--- tests/autopilot/unity8/shell/__init__.py	2014-05-01 14:25:18 +0000
+++ tests/autopilot/unity8/shell/__init__.py	2015-02-02 14:28:47 +0000
@@ -27,19 +27,6 @@
 
 logger = logging.getLogger(__name__)
 
-
-def with_lightdm_mock(mock_type):
-    """A simple decorator that sets up the LightDM mock for a single test."""
-    def with_lightdm_mock_internal(fn):
-        @wraps(fn)
-        def wrapper(*args, **kwargs):
-            tests_self = args[0]
-            tests_self.patch_lightdm_mock(mock_type)
-            return fn(*args, **kwargs)
-        return wrapper
-    return with_lightdm_mock_internal
-
-
 def disable_qml_mocking(fn):
     """Simple decorator that disables the QML mocks from being loaded."""
     @wraps(fn)

=== modified file 'tests/autopilot/unity8/shell/tests/__init__.py'
--- tests/autopilot/unity8/shell/tests/__init__.py	2014-10-31 08:37:28 +0000
+++ tests/autopilot/unity8/shell/tests/__init__.py	2015-02-02 14:28:47 +0000
@@ -153,7 +153,6 @@
             self.useFixture(toolkit_fixtures.HideUnity7Launcher())
 
         self._proxy = None
-        self._lightdm_mock_type = None
         self._qml_mock_enabled = True
         self._data_dirs_mock_enabled = True
         self._environment = {}
@@ -265,8 +264,7 @@
             binary_path
         )
 
-        if self._lightdm_mock_type is None:
-            self.patch_lightdm_mock()
+        self.patch_lightdm_mock()
 
         if self._qml_mock_enabled:
             self._environment['QML2_IMPORT_PATH'] = (
@@ -338,12 +336,11 @@
         if data_dirs is not None:
             self._environment['XDG_DATA_DIRS'] = data_dirs
 
-    def patch_lightdm_mock(self, mock_type='single'):
-        self._lightdm_mock_type = mock_type
-        logger.info("Setting up LightDM mock type '%s'", mock_type)
+    def patch_lightdm_mock(self):
+        logger.info("Setting up LightDM mock lib")
         new_ld_library_path = [
             get_default_extra_mock_libraries(),
-            self._get_lightdm_mock_path(mock_type)
+            self._get_lightdm_mock_path()
         ]
         if os.getenv('LD_LIBRARY_PATH') is not None:
             new_ld_library_path.append(os.getenv('LD_LIBRARY_PATH'))
@@ -353,16 +350,16 @@
 
         self._environment['LD_LIBRARY_PATH'] = new_ld_library_path
 
-    def _get_lightdm_mock_path(self, mock_type):
+    def _get_lightdm_mock_path(self):
         lib_path = get_mocks_library_path()
         lightdm_mock_path = os.path.abspath(
-            os.path.join(lib_path, "LightDM", mock_type)
+            os.path.join(lib_path, "LightDM", "liblightdm")
         )
 
         if not os.path.exists(lightdm_mock_path):
             raise RuntimeError(
-                "LightDM mock '%s' does not exist at path '%s'."
-                % (mock_type, lightdm_mock_path)
+                "LightDM mock does not exist at path '%s'."
+                % (lightdm_mock_path)
             )
         return lightdm_mock_path
 

=== modified file 'tests/autopilot/unity8/shell/tests/test_edges_demo.py'
--- tests/autopilot/unity8/shell/tests/test_edges_demo.py	2015-01-09 16:59:07 +0000
+++ tests/autopilot/unity8/shell/tests/test_edges_demo.py	2015-02-02 14:28:47 +0000
@@ -34,7 +34,6 @@
         super(EdgesDemoTestCase, self).setUp()
         self._qml_mock_enabled = False
         self._data_dirs_mock_enabled = False
-        self._lightdm_mock_type = False
 
         self.useFixture(fixture_setup.EdgesDemo(True))
         self.unity = self.launch_unity()

=== modified file 'tests/autopilot/unity8/shell/tests/test_lock_screen.py'
--- tests/autopilot/unity8/shell/tests/test_lock_screen.py	2014-09-29 19:54:33 +0000
+++ tests/autopilot/unity8/shell/tests/test_lock_screen.py	2015-02-02 14:28:47 +0000
@@ -20,7 +20,6 @@
 
 from __future__ import absolute_import
 
-from unity8.shell import with_lightdm_mock
 from unity8.shell.tests import UnityTestCase, _get_device_emulation_scenarios
 
 from autopilot.matchers import Eventually
@@ -41,9 +40,10 @@
 
     scenarios = _get_device_emulation_scenarios()
 
-    @with_lightdm_mock("single-pin")
     def test_can_unlock_pin_screen(self):
         """Must be able to unlock the PIN entry lock screen."""
+
+        self._environment['LIBLIGHTDM_MOCK_MODE'] = "single-pin"
         self.launch_unity()
         greeter = self.main_window.get_greeter()
 
@@ -56,9 +56,10 @@
             self._enter_prompt_passphrase("1234\n")
             self.assertThat(greeter.shown, Eventually(Equals(False)))
 
-    @with_lightdm_mock("single-passphrase")
     def test_can_unlock_passphrase_screen(self):
         """Must be able to unlock the passphrase entry screen."""
+
+        self._environment['LIBLIGHTDM_MOCK_MODE'] = "single-passphrase"
         self.launch_unity()
         greeter = self.main_window.get_greeter()
 
@@ -71,9 +72,9 @@
             self._enter_prompt_passphrase("password")
             self.assertThat(greeter.shown, Eventually(Equals(False)))
 
-    @with_lightdm_mock("single-pin")
     def test_pin_screen_wrong_code(self):
         """Entering the wrong pin code must not dismiss the lock screen."""
+        self._environment['LIBLIGHTDM_MOCK_MODE'] = "single-pin"
         self.launch_unity()
         greeter = self.main_window.get_greeter()
 
@@ -90,9 +91,9 @@
             self.assertThat(prompt.text, Eventually(Equals("")))
             self.assertThat(greeter.shown, Eventually(Equals(True)))
 
-    @with_lightdm_mock("single-passphrase")
     def test_passphrase_screen_wrong_password(self):
         """Entering the wrong password must not dismiss the lock screen."""
+        self._environment['LIBLIGHTDM_MOCK_MODE'] = "single-passphrase"
         self.launch_unity()
         greeter = self.main_window.get_greeter()
 

=== modified file 'tests/mocks/LightDM/CMakeLists.txt'
--- tests/mocks/LightDM/CMakeLists.txt	2015-01-22 16:41:18 +0000
+++ tests/mocks/LightDM/CMakeLists.txt	2015-02-02 14:28:47 +0000
@@ -4,16 +4,13 @@
 # actually using the system liblightdm in the normal plugin, this version can
 # be deleted.
 
-add_subdirectory(demo)
-add_subdirectory(full)
-add_subdirectory(single)
-add_subdirectory(single-pin)
-add_subdirectory(single-passphrase)
+add_subdirectory(liblightdm)
 
 include_directories(
     ${CMAKE_CURRENT_SOURCE_DIR}
     ${CMAKE_CURRENT_BINARY_DIR}
     ${CMAKE_SOURCE_DIR}/plugins/Utils
+    ${CMAKE_SOURCE_DIR}/plugins/LightDM
     ${CMAKE_SOURCE_DIR}/tests/mocks/libusermetrics
     ${libunity8-private_SOURCE_DIR}
 )
@@ -22,9 +19,11 @@
     ${CMAKE_SOURCE_DIR}/plugins/LightDM/DBusGreeter.cpp
     ${CMAKE_SOURCE_DIR}/plugins/LightDM/DBusGreeterList.cpp
     ${CMAKE_SOURCE_DIR}/plugins/LightDM/Greeter.cpp
-    ${CMAKE_SOURCE_DIR}/plugins/LightDM/plugin.cpp
     ${CMAKE_SOURCE_DIR}/plugins/LightDM/UsersModel.cpp
     ${CMAKE_SOURCE_DIR}/plugins/Utils/unitysortfilterproxymodelqml.cpp
+    MockGreeter.cpp
+    MockUsersModel.cpp
+    plugin.cpp
     )
 
 add_library(MockLightDM-qml MODULE
@@ -35,9 +34,9 @@
 # installed on the system.  So we make sure we link to our full fake version
 # At run time, we can point to whichever version we happen to be using via
 # LD_LIBRARY_PATH.
-add_dependencies(MockLightDM-qml MockLightDM-full MockUserMetrics)
+add_dependencies(MockLightDM-qml MockLightDM MockUserMetrics)
 target_link_libraries(MockLightDM-qml
-    -L${CMAKE_CURRENT_BINARY_DIR}/full
+    -L${CMAKE_CURRENT_BINARY_DIR}/liblightdm
     -llightdm-qt5-2
     -L${CMAKE_BINARY_DIR}/tests/mocks/libusermetrics
     -lusermetricsoutput
@@ -49,5 +48,5 @@
 add_unity8_mock(LightDM 0.1 LightDM
     PREFIX mocks
     TARGETS MockLightDM-qml
-    ENVIRONMENT "LD_LIBRARY_PATH=${CMAKE_CURRENT_BINARY_DIR}/full"
+    ENVIRONMENT "LD_LIBRARY_PATH=${CMAKE_CURRENT_BINARY_DIR}/liblightdm"
 )

=== added file 'tests/mocks/LightDM/MockGreeter.cpp'
--- tests/mocks/LightDM/MockGreeter.cpp	1970-01-01 00:00:00 +0000
+++ tests/mocks/LightDM/MockGreeter.cpp	2015-02-02 14:28:47 +0000
@@ -0,0 +1,35 @@
+/*
+ * Copyright (C) 2014 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#include "MockGreeter.h"
+#include <GreeterPrivate.h>
+
+QString MockGreeter::mockMode() const
+{
+    Q_D(const Greeter);
+    return d->m_greeter->mockMode();
+}
+
+void MockGreeter::setMockMode(QString mockMode)
+{
+    Q_D(Greeter);
+
+    if (d->m_greeter->mockMode() != mockMode) {
+        d->m_greeter->setMockMode(mockMode);
+        Q_EMIT mockModeChanged(mockMode);
+    }
+}

=== added file 'tests/mocks/LightDM/MockGreeter.h'
--- tests/mocks/LightDM/MockGreeter.h	1970-01-01 00:00:00 +0000
+++ tests/mocks/LightDM/MockGreeter.h	2015-02-02 14:28:47 +0000
@@ -0,0 +1,37 @@
+/*
+ * Copyright (C) 2014 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+// The real, production, Greeter
+#include <Greeter.h>
+
+#ifndef MOCK_UNITY_GREETER_H
+#define MOCK_UNITY_GREETER_H
+
+class MockGreeter : public Greeter {
+    Q_OBJECT
+
+    Q_PROPERTY(QString mockMode READ mockMode WRITE setMockMode NOTIFY mockModeChanged)
+
+public:
+    QString mockMode() const;
+    void setMockMode(QString mockMode);
+
+Q_SIGNALS:
+    void mockModeChanged(QString mode);
+};
+
+#endif // MOCK_UNITY_GREETER_H

=== added file 'tests/mocks/LightDM/MockUsersModel.cpp'
--- tests/mocks/LightDM/MockUsersModel.cpp	1970-01-01 00:00:00 +0000
+++ tests/mocks/LightDM/MockUsersModel.cpp	2015-02-02 14:28:47 +0000
@@ -0,0 +1,39 @@
+/*
+ * Copyright (C) 2014 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#include "MockUsersModel.h"
+#include <QLightDM/UsersModel>
+#include <QSortFilterProxyModel>
+
+QString MockUsersModel::mockMode() const
+{
+    QLightDM::UsersModel* qUsersModel =
+        static_cast<QLightDM::UsersModel*>(static_cast<QSortFilterProxyModel*>(sourceModel())->sourceModel());
+
+    return qUsersModel->mockMode();
+}
+
+void MockUsersModel::setMockMode(QString mockMode)
+{
+    QLightDM::UsersModel* qUsersModel =
+        static_cast<QLightDM::UsersModel*>(static_cast<QSortFilterProxyModel*>(sourceModel())->sourceModel());
+
+    if (qUsersModel->mockMode() != mockMode) {
+        qUsersModel->setMockMode(mockMode);
+        Q_EMIT mockModeChanged(mockMode);
+    }
+}

=== added file 'tests/mocks/LightDM/MockUsersModel.h'
--- tests/mocks/LightDM/MockUsersModel.h	1970-01-01 00:00:00 +0000
+++ tests/mocks/LightDM/MockUsersModel.h	2015-02-02 14:28:47 +0000
@@ -0,0 +1,37 @@
+/*
+ * Copyright (C) 2014 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#ifndef MOCK_UNITY_USERSMODEL_H
+#define MOCK_UNITY_USERSMODEL_H
+
+#include <UsersModel.h>
+
+class MockUsersModel : public UsersModel
+{
+    Q_OBJECT
+
+    Q_PROPERTY(QString mockMode READ mockMode WRITE setMockMode NOTIFY mockModeChanged)
+
+public:
+    QString mockMode() const;
+    void setMockMode(QString mockMode);
+
+Q_SIGNALS:
+    void mockModeChanged(QString mode);
+};
+
+#endif // MOCK_UNITY_USERSMODEL_H

=== added file 'tests/mocks/LightDM/QLightDM/Greeter'
--- tests/mocks/LightDM/QLightDM/Greeter	1970-01-01 00:00:00 +0000
+++ tests/mocks/LightDM/QLightDM/Greeter	2015-02-02 14:28:47 +0000
@@ -0,0 +1,17 @@
+/*
+ * Copyright (C) 2014 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "../liblightdm/Greeter.h"

=== removed symlink 'tests/mocks/LightDM/QLightDM/Greeter'
=== target was u'../Greeter.h'
=== removed symlink 'tests/mocks/LightDM/QLightDM/InfographicModel'
=== target was u'../InfographicModel.h'
=== added file 'tests/mocks/LightDM/QLightDM/UsersModel'
--- tests/mocks/LightDM/QLightDM/UsersModel	1970-01-01 00:00:00 +0000
+++ tests/mocks/LightDM/QLightDM/UsersModel	2015-02-02 14:28:47 +0000
@@ -0,0 +1,17 @@
+/*
+ * Copyright (C) 2014 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "../liblightdm/UsersModel.h"

=== removed symlink 'tests/mocks/LightDM/QLightDM/UsersModel'
=== target was u'../UsersModel.h'
=== removed directory 'tests/mocks/LightDM/demo'
=== removed file 'tests/mocks/LightDM/demo/CMakeLists.txt'
--- tests/mocks/LightDM/demo/CMakeLists.txt	2015-01-12 10:40:46 +0000
+++ tests/mocks/LightDM/demo/CMakeLists.txt	1970-01-01 00:00:00 +0000
@@ -1,37 +0,0 @@
-pkg_check_modules(LIBUSERMETRICSOUTPUT REQUIRED libusermetricsoutput-1)
-
-set(LibLightDM_SOURCES
-    ../Greeter.cpp
-    ../UsersModel.cpp
-    GreeterPrivate.cpp
-    UsersModelPrivate.cpp
-    ${CMAKE_SOURCE_DIR}/plugins/Utils/qvariantlistmodel.cpp
-    )
-
-add_library(MockLightDM-demo STATIC ${LibLightDM_SOURCES})
-add_library(MockLightDM-demo-shared SHARED ${LibLightDM_SOURCES})
-
-include_directories(
-    ${CMAKE_CURRENT_BINARY_DIR}
-    ${LIBUSERMETRICSOUTPUT_INCLUDE_DIRS}
-)
-
-target_link_libraries(MockLightDM-demo
-    ${LIBUSERMETRICSOUTPUT_LDFLAGS}
-    -lpam
-)
-target_link_libraries(MockLightDM-demo-shared
-    ${LIBUSERMETRICSOUTPUT_LDFLAGS}
-    -lpam
-)
-
-qt5_use_modules(MockLightDM-demo Concurrent Gui)
-qt5_use_modules(MockLightDM-demo-shared Concurrent Gui)
-
-set_target_properties(MockLightDM-demo PROPERTIES COMPILE_FLAGS -fPIC)
-set_target_properties(MockLightDM-demo-shared PROPERTIES
-                      OUTPUT_NAME lightdm-qt5-2)
-
-install(TARGETS MockLightDM-demo-shared
-    DESTINATION ${SHELL_INSTALL_QML}/mocks/LightDM/demo
-    )

=== removed file 'tests/mocks/LightDM/demo/GreeterPrivate.cpp'
--- tests/mocks/LightDM/demo/GreeterPrivate.cpp	2014-08-26 08:14:44 +0000
+++ tests/mocks/LightDM/demo/GreeterPrivate.cpp	1970-01-01 00:00:00 +0000
@@ -1,281 +0,0 @@
-/*
- * Copyright (C) 2013 Canonical, Ltd.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Author: Michael Terry <[e-mail]>
- */
-
-#include "../Greeter.h"
-#include "../GreeterPrivate.h"
-#include <QFuture>
-#include <QFutureInterface>
-#include <QFutureWatcher>
-#include <QQueue>
-#include <QtConcurrent>
-#include <QVector>
-#include <security/pam_appl.h>
-
-namespace QLightDM
-{
-
-class GreeterImpl : public QObject
-{
-    Q_OBJECT
-
-    struct AppData
-    {
-        GreeterImpl *impl;
-        pam_handle *handle;
-    };
-
-    typedef QFutureInterface<QString> ResponseFuture;
-
-public:
-    explicit GreeterImpl(Greeter *parent, GreeterPrivate *greeterPrivate)
-        : QObject(parent),
-          greeter(parent),
-          greeterPrivate(greeterPrivate),
-          pamHandle(nullptr)
-    {
-        qRegisterMetaType<QLightDM::GreeterImpl::ResponseFuture>("QLightDM::GreeterImpl::ResponseFuture");
-
-        connect(&futureWatcher, SIGNAL(finished()),
-                this, SLOT(finishPam()));
-        connect(this, SIGNAL(showMessage(pam_handle *, QString, QLightDM::Greeter::MessageType)),
-                this, SLOT(handleMessage(pam_handle *, QString, QLightDM::Greeter::MessageType)));
-        // This next connect is how we pass ResponseFutures between threads
-        connect(this, SIGNAL(showPrompt(pam_handle *, QString, QLightDM::Greeter::PromptType, QLightDM::GreeterImpl::ResponseFuture)),
-                this, SLOT(handlePrompt(pam_handle *, QString, QLightDM::Greeter::PromptType, QLightDM::GreeterImpl::ResponseFuture)));
-    }
-
-    ~GreeterImpl()
-    {
-        cancelPam();
-    }
-
-    void start(QString username)
-    {
-        // Clear out any existing PAM interactions first
-        cancelPam();
-
-        AppData *appData = new AppData();
-        appData->impl = this;
-
-        // Now actually start a new conversation with PAM
-        pam_conv conversation;
-        conversation.conv = converseWithPam;
-        conversation.appdata_ptr = static_cast<void*>(appData);
-
-        if (pam_start("lightdm", username.toUtf8(), &conversation, &pamHandle) == PAM_SUCCESS) {
-            appData->handle = pamHandle;
-            futureWatcher.setFuture(QtConcurrent::run(authenticateWithPam, pamHandle));
-        } else {
-            delete appData;
-            greeterPrivate->authenticated = false;
-            Q_EMIT greeter->showMessage("Internal error: could not start PAM authentication", QLightDM::Greeter::MessageTypeError);
-            Q_EMIT greeter->authenticationComplete();
-        }
-    }
-
-    static int authenticateWithPam(pam_handle* pamHandle)
-    {
-        int pamStatus = pam_authenticate(pamHandle, 0);
-        if (pamStatus == PAM_SUCCESS) {
-            pamStatus = pam_acct_mgmt(pamHandle, 0);
-        }
-        if (pamStatus == PAM_NEW_AUTHTOK_REQD) {
-            pamStatus = pam_chauthtok(pamHandle, PAM_CHANGE_EXPIRED_AUTHTOK);
-        }
-        if (pamStatus == PAM_SUCCESS) {
-            pam_setcred(pamHandle, PAM_REINITIALIZE_CRED);
-        }
-        return pamStatus;
-    }
-
-    static int converseWithPam(int num_msg, const pam_message** msg,
-                               pam_response** resp, void* appdata_ptr)
-    {
-        if (num_msg <= 0)
-            return PAM_CONV_ERR;
-
-        auto* tmp_response = static_cast<pam_response*>(calloc(num_msg, sizeof(pam_response)));
-        if (!tmp_response)
-            return PAM_CONV_ERR;
-
-        AppData *appData = static_cast<AppData*>(appdata_ptr);
-        GreeterImpl *impl = appData->impl;
-        pam_handle *handle = appData->handle;
-
-        int count;
-        QVector<ResponseFuture> responses;
-
-        for (count = 0; count < num_msg; ++count)
-        {
-            switch (msg[count]->msg_style)
-            {
-            case PAM_PROMPT_ECHO_ON:
-            {
-                QString message(msg[count]->msg);
-                responses.append(ResponseFuture());
-                responses.last().reportStarted();
-                Q_EMIT impl->showPrompt(handle, message, Greeter::PromptTypeQuestion, responses.last());
-                break;
-            }
-            case PAM_PROMPT_ECHO_OFF:
-            {
-                QString message(msg[count]->msg);
-                responses.append(ResponseFuture());
-                responses.last().reportStarted();
-                Q_EMIT impl->showPrompt(handle, message, Greeter::PromptTypeSecret, responses.last());
-                break;
-            }
-            case PAM_TEXT_INFO:
-            {
-                QString message(msg[count]->msg);
-                Q_EMIT impl->showMessage(handle, message, Greeter::MessageTypeInfo);
-                break;
-            }
-            default:
-            {
-                QString message(msg[count]->msg);
-                Q_EMIT impl->showMessage(handle, message, Greeter::MessageTypeError);
-                break;
-            }
-            }
-        }
-
-        int i = 0;
-        bool raise_error = false;
-
-        for (auto &response : responses)
-        {
-            pam_response* resp_item = &tmp_response[i++];
-            resp_item->resp_retcode = 0;
-            resp_item->resp = strdup(response.future().result().toUtf8());
-
-            if (!resp_item->resp)
-            {
-                raise_error = true;
-                break;
-            }
-        }
-
-        delete appData;
-
-        if (raise_error)
-        {
-            for (int i = 0; i < count; ++i)
-                free(tmp_response[i].resp);
-
-            free(tmp_response);
-            return PAM_CONV_ERR;
-        }
-        else
-        {
-            *resp = tmp_response;
-            return PAM_SUCCESS;
-        }
-    }
-
-public Q_SLOTS:
-    bool respond(QString response)
-    {
-        if (!futures.isEmpty()) {
-            futures.dequeue().reportFinished(&response);
-            return true;
-        } else {
-            return false;
-        }
-    }
-
-Q_SIGNALS:
-    void showMessage(pam_handle *handle, QString text, QLightDM::Greeter::MessageType type);
-    void showPrompt(pam_handle *handle, QString text, QLightDM::Greeter::PromptType type, QLightDM::GreeterImpl::ResponseFuture response);
-
-private Q_SLOTS:
-    void finishPam()
-    {
-        if (pamHandle == nullptr) {
-            return;
-        }
-
-        int pamStatus = futureWatcher.result();
-
-        pam_end(pamHandle, pamStatus);
-        pamHandle = nullptr;
-
-        greeterPrivate->authenticated = (pamStatus == PAM_SUCCESS);
-        Q_EMIT greeter->authenticationComplete();
-    }
-
-    void handleMessage(pam_handle *handle, QString text, QLightDM::Greeter::MessageType type)
-    {
-        if (handle != pamHandle)
-            return;
-
-        Q_EMIT greeter->showMessage(text, type);
-    }
-
-    void handlePrompt(pam_handle *handle, QString text, QLightDM::Greeter::PromptType type, QLightDM::GreeterImpl::ResponseFuture future)
-    {
-        if (handle != pamHandle) {
-            future.reportResult(QString());
-            future.reportFinished();
-            return;
-        }
-
-        futures.enqueue(future);
-        Q_EMIT greeter->showPrompt(text, type);
-    }
-
-private:
-    void cancelPam()
-    {
-        // Unfortunately we can't simply cancel our QFuture because QtConcurrent::run doesn't support cancel
-        if (pamHandle != nullptr) {
-            pam_handle *handle = pamHandle;
-            pamHandle = nullptr; // to disable normal finishPam() handling
-            while (respond(QString())); // clear our local queue of QFutures
-            pam_end(handle, PAM_CONV_ERR);
-        }
-    }
-
-    Greeter *greeter;
-    GreeterPrivate *greeterPrivate;
-    pam_handle* pamHandle;
-    QFutureWatcher<int> futureWatcher;
-    QQueue<ResponseFuture> futures;
-};
-
-GreeterPrivate::GreeterPrivate(Greeter* parent)
-  : authenticated(false),
-    authenticationUser(),
-    m_impl(new GreeterImpl(parent, this)),
-    q_ptr(parent)
-{
-}
-
-void GreeterPrivate::handleAuthenticate()
-{
-    m_impl->start(authenticationUser);
-}
-
-void GreeterPrivate::handleRespond(const QString &response)
-{
-    m_impl->respond(response);
-}
-
-}
-
-#include "GreeterPrivate.moc"

=== removed file 'tests/mocks/LightDM/demo/UsersModelPrivate.cpp'
--- tests/mocks/LightDM/demo/UsersModelPrivate.cpp	2014-07-15 16:38:02 +0000
+++ tests/mocks/LightDM/demo/UsersModelPrivate.cpp	1970-01-01 00:00:00 +0000
@@ -1,41 +0,0 @@
-/*
- * Copyright (C) 2013 Canonical, Ltd.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Author: Michael Terry <[e-mail]>
- */
-
-#include "../UsersModelPrivate.h"
-
-#include <QDir>
-#include <QSettings>
-#include <QStringList>
-
-namespace QLightDM
-{
-
-UsersModelPrivate::UsersModelPrivate(UsersModel* parent)
-  : q_ptr(parent)
-{
-    QSettings settings(QDir::homePath() + "/.unity8-greeter-demo", QSettings::NativeFormat);
-    QStringList users = settings.value("users", QStringList() << qgetenv("USER")).toStringList();
-
-    Q_FOREACH(const QString &user, users)
-    {
-        QString name = settings.value(user + "/name", user[0].toUpper() + user.mid(1)).toString();
-        entries.append({user, name, 0, 0, false, false, 0, 0});
-    }
-}
-
-}

=== removed directory 'tests/mocks/LightDM/full'
=== removed file 'tests/mocks/LightDM/full/CMakeLists.txt'
--- tests/mocks/LightDM/full/CMakeLists.txt	2014-06-11 15:36:51 +0000
+++ tests/mocks/LightDM/full/CMakeLists.txt	1970-01-01 00:00:00 +0000
@@ -1,18 +0,0 @@
-set(LibLightDM_SOURCES
-    ../Greeter.cpp
-    ../UsersModel.cpp
-    GreeterPrivate.cpp
-    UsersModelPrivate.cpp
-    ${CMAKE_SOURCE_DIR}/plugins/Utils/qvariantlistmodel.cpp
-    )
-
-add_library(MockLightDM-full SHARED ${LibLightDM_SOURCES})
-
-qt5_use_modules(MockLightDM-full Gui)
-
-set_target_properties(MockLightDM-full PROPERTIES
-                      OUTPUT_NAME lightdm-qt5-2)
-
-install(TARGETS MockLightDM-full
-    DESTINATION ${SHELL_INSTALL_QML}/mocks/LightDM/full
-    )

=== removed file 'tests/mocks/LightDM/full/GreeterPrivate.cpp'
--- tests/mocks/LightDM/full/GreeterPrivate.cpp	2014-08-06 15:27:57 +0000
+++ tests/mocks/LightDM/full/GreeterPrivate.cpp	1970-01-01 00:00:00 +0000
@@ -1,98 +0,0 @@
-/*
- * Copyright (C) 2013 Canonical, Ltd.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Author: Michael Terry <[e-mail]>
- */
-
-#include "../Greeter.h"
-#include "../GreeterPrivate.h"
-
-namespace QLightDM
-{
-
-GreeterPrivate::GreeterPrivate(Greeter* parent)
-  : authenticated(false),
-    authenticationUser(),
-    twoFactorDone(false),
-    q_ptr(parent)
-{
-}
-
-void GreeterPrivate::handleAuthenticate()
-{
-    Q_Q(Greeter);
-
-    // Send out any messages we need to
-    if (authenticationUser == "info-prompt")
-        Q_EMIT q->showMessage("Welcome to Unity Greeter", Greeter::MessageTypeInfo);
-    else if (authenticationUser == "wide-info-prompt")
-        Q_EMIT q->showMessage("Welcome to Unity Greeter, the greeteriest greeter that ever did appear in these fine lands", Greeter::MessageTypeInfo);
-    else if (authenticationUser == "html-info-prompt")
-        Q_EMIT q->showMessage("<b>&</b>", Greeter::MessageTypeInfo);
-    else if (authenticationUser == "long-info-prompt")
-        Q_EMIT q->showMessage("Welcome to Unity Greeter\n\nWe like to annoy you with super ridiculously long messages.\nLike this one\n\nThis is the last line of a multiple line message.", Greeter::MessageTypeInfo);
-    else if (authenticationUser == "multi-info-prompt") {
-        Q_EMIT q->showMessage("Welcome to Unity Greeter", Greeter::MessageTypeInfo);
-        Q_EMIT q->showMessage("This is an error", Greeter::MessageTypeError);
-        Q_EMIT q->showMessage("You should have seen three messages", Greeter::MessageTypeInfo);
-    }
-
-    // OK, now actually do the prompt
-    if (authenticationUser == "no-password") {
-        authenticated = true;
-        Q_EMIT q->authenticationComplete();
-    } else if (authenticationUser == "has-pin"){
-        Q_EMIT q->showPrompt("Password: ", Greeter::PromptTypeSecret);
-    } else if (authenticationUser == "auth-error") {
-        authenticated = false;
-        Q_EMIT q->authenticationComplete();
-    } else if (authenticationUser == "different-prompt") {
-        Q_EMIT q->showPrompt("Secret word： ", Greeter::PromptTypeSecret);
-    } else {
-        Q_EMIT q->showPrompt("Password: ", Greeter::PromptTypeSecret);
-    }
-}
-
-void GreeterPrivate::handleRespond(const QString &response)
-{
-    Q_Q(Greeter);
-
-    if (authenticationUser == "no-response")
-        return;
-    else if (authenticationUser == "two-factor") {
-        if (!twoFactorDone) {
-            if (response == "password") {
-                twoFactorDone = true;
-                Q_EMIT q->showPrompt("otp", Greeter::PromptTypeQuestion);
-            } else {
-                authenticated = false;
-                q->sendAuthenticationComplete();
-            }
-        } else {
-            authenticated = (response == "otp");
-            q->sendAuthenticationComplete();
-        }
-        return;
-    }
-
-    if (authenticationUser == "has-pin") {
-        authenticated = (response == "1234");
-    } else {
-        authenticated = (response == "password");
-    }
-    q->sendAuthenticationComplete();
-}
-
-}

=== removed file 'tests/mocks/LightDM/full/UsersModelPrivate.cpp'
--- tests/mocks/LightDM/full/UsersModelPrivate.cpp	2013-06-11 10:30:07 +0000
+++ tests/mocks/LightDM/full/UsersModelPrivate.cpp	1970-01-01 00:00:00 +0000
@@ -1,52 +0,0 @@
-/*
- * Copyright (C) 2013 Canonical, Ltd.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Author: Michael Terry <[e-mail]>
- */
-
-#include "../UsersModelPrivate.h"
-
-namespace QLightDM
-{
-
-UsersModelPrivate::UsersModelPrivate(UsersModel* parent)
-  : q_ptr(parent)
-{
-    entries =
-    {
-        { "has-password",      "Has Password", 0, 0, false, false, 0, 0 },
-        { "has-pin",           "Has PIN",      0, 0, false, false, 0, 0 },
-        { "different-prompt",  "Different Prompt", 0, 0, false, false, 0, 0 },
-        { "no-password",       "No Password", 0, 0, false, false, 0, 0 },
-        { "auth-error",        "Auth Error", 0, 0, false, false, 0, 0 },
-        { "two-factor",        "Two Factor", 0, 0, false, false, 0, 0 },
-        { "info-prompt",       "Info Prompt", 0, 0, false, false, 0, 0 },
-        { "html-info-prompt",  "HTML Info Prompt", 0, 0, false, false, 0, 0 },
-        { "long-info-prompt",  "Long Info Prompt", 0, 0, false, false, 0, 0 },
-        { "wide-info-prompt",  "Wide Info Prompt", 0, 0, false, false, 0, 0 },
-        { "multi-info-prompt", "Multi Info Prompt", 0, 0, false, false, 0, 0 },
-        { "long-name",         "Long name (far far too long to fit)", 0, 0, false, false, 0, 0 },
-        { "color-background",  "Color Background", "#dd4814", 0, false, false, 0, 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, 0, 0 },
-        { "black-background",  "Black Background", "#000000", 0, false, false, 0, 0 },
-        { "no-background",     "No Background", "", 0, false, false, 0, 0 },
-        { "unicode",           "가나다라마", 0, 0, false, false, 0, 0 },
-        { "no-response",       "No Response", 0, 0, false, false, 0, 0 },
-        { "empty-name",        "", 0, 0, false, false, 0, 0 },
-    };
-}
-
-}

=== added directory 'tests/mocks/LightDM/liblightdm'
=== added file 'tests/mocks/LightDM/liblightdm/CMakeLists.txt'
--- tests/mocks/LightDM/liblightdm/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ tests/mocks/LightDM/liblightdm/CMakeLists.txt	2015-02-02 14:28:47 +0000
@@ -0,0 +1,18 @@
+set(LibLightDM_SOURCES
+    Greeter.cpp
+    UsersModel.cpp
+    GreeterPrivate.cpp
+    UsersModelPrivate.cpp
+    ${CMAKE_SOURCE_DIR}/plugins/Utils/qvariantlistmodel.cpp
+    )
+
+add_library(MockLightDM SHARED ${LibLightDM_SOURCES})
+
+qt5_use_modules(MockLightDM Gui)
+
+set_target_properties(MockLightDM PROPERTIES
+                      OUTPUT_NAME lightdm-qt5-2)
+
+install(TARGETS MockLightDM
+    DESTINATION ${SHELL_INSTALL_QML}/mocks/LightDM/liblightdm
+    )

=== renamed file 'tests/mocks/LightDM/Greeter.cpp' => 'tests/mocks/LightDM/liblightdm/Greeter.cpp'
--- tests/mocks/LightDM/Greeter.cpp	2014-12-09 17:14:35 +0000
+++ tests/mocks/LightDM/liblightdm/Greeter.cpp	2015-02-02 14:28:47 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013 Canonical, Ltd.
+ * Copyright (C) 2014 Canonical, Ltd.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -12,8 +12,6 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Author: Michael Terry <[e-mail]>
  */
 
 #include "Greeter.h"
@@ -181,4 +179,21 @@
     }
 }
 
+QString Greeter::mockMode() const
+{
+    Q_D(const Greeter);
+    return d->mockMode;
+}
+
+
+void Greeter::setMockMode(QString mockMode)
+{
+    Q_D(Greeter);
+
+    if (d->mockMode != mockMode) {
+        d->mockMode = mockMode;
+        Q_EMIT mockModeChanged(mockMode);
+    }
+}
+
 }

=== renamed file 'tests/mocks/LightDM/Greeter.h' => 'tests/mocks/LightDM/liblightdm/Greeter.h'
--- tests/mocks/LightDM/Greeter.h	2014-12-09 17:14:35 +0000
+++ tests/mocks/LightDM/liblightdm/Greeter.h	2015-02-02 14:28:47 +0000
@@ -47,6 +47,9 @@
 
     Q_ENUMS(PromptType MessageType)
 
+    //Mock-only API for testing purposes
+    Q_PROPERTY(QString mockMode READ mockMode WRITE setMockMode NOTIFY mockModeChanged)
+
 public:
     enum PromptType {
         PromptTypeQuestion,
@@ -79,6 +82,9 @@
     QString authenticationUser() const;
     QString hostname() const;
 
+    QString mockMode() const;
+    void setMockMode(QString mockMode);
+
 public Q_SLOTS:
     bool connectSync();
     void authenticate(const QString &username=QString());
@@ -95,6 +101,7 @@
     void showPrompt(QString text, QLightDM::Greeter::PromptType type);
     void authenticationComplete();
     void autologinTimerExpired();
+    void mockModeChanged(QString mode);
 
 protected:
     void sendAuthenticationComplete();

=== added file 'tests/mocks/LightDM/liblightdm/GreeterPrivate.cpp'
--- tests/mocks/LightDM/liblightdm/GreeterPrivate.cpp	1970-01-01 00:00:00 +0000
+++ tests/mocks/LightDM/liblightdm/GreeterPrivate.cpp	2015-02-02 14:28:47 +0000
@@ -0,0 +1,132 @@
+/*
+ * Copyright (C) 2014 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "Greeter.h"
+#include "GreeterPrivate.h"
+
+namespace QLightDM
+{
+
+GreeterPrivate::GreeterPrivate(Greeter* parent)
+  : authenticated(false),
+    authenticationUser(),
+    twoFactorDone(false),
+    mockMode("single"),
+    q_ptr(parent)
+{
+    char *envMockMode = getenv("LIBLIGHTDM_MOCK_MODE");
+    if (envMockMode) {
+        mockMode = envMockMode;
+    }
+}
+
+void GreeterPrivate::handleAuthenticate()
+{
+    Q_Q(Greeter);
+
+    if (mockMode == "single") {
+        authenticated = true;
+        Q_EMIT q->authenticationComplete();
+    } else if (mockMode == "single-passphrase" || mockMode == "single-pin") {
+        Q_EMIT q->showPrompt("Password: ", Greeter::PromptTypeSecret);
+    } else if (mockMode == "full") {
+        handleAuthenticate_full();
+    }
+}
+
+void GreeterPrivate::handleAuthenticate_full()
+{
+    Q_Q(Greeter);
+
+    // Send out any messages we need to
+    if (authenticationUser == "info-prompt")
+        Q_EMIT q->showMessage("Welcome to Unity Greeter", Greeter::MessageTypeInfo);
+    else if (authenticationUser == "wide-info-prompt")
+        Q_EMIT q->showMessage("Welcome to Unity Greeter, the greeteriest greeter that ever did appear in these fine lands", Greeter::MessageTypeInfo);
+    else if (authenticationUser == "html-info-prompt")
+        Q_EMIT q->showMessage("<b>&</b>", Greeter::MessageTypeInfo);
+    else if (authenticationUser == "long-info-prompt")
+        Q_EMIT q->showMessage("Welcome to Unity Greeter\n\nWe like to annoy you with super ridiculously long messages.\nLike this one\n\nThis is the last line of a multiple line message.", Greeter::MessageTypeInfo);
+    else if (authenticationUser == "multi-info-prompt") {
+        Q_EMIT q->showMessage("Welcome to Unity Greeter", Greeter::MessageTypeInfo);
+        Q_EMIT q->showMessage("This is an error", Greeter::MessageTypeError);
+        Q_EMIT q->showMessage("You should have seen three messages", Greeter::MessageTypeInfo);
+    }
+
+    // OK, now actually do the prompt
+    if (authenticationUser == "no-password") {
+        authenticated = true;
+        Q_EMIT q->authenticationComplete();
+    } else if (authenticationUser == "has-pin"){
+        Q_EMIT q->showPrompt("Password: ", Greeter::PromptTypeSecret);
+    } else if (authenticationUser == "auth-error") {
+        authenticated = false;
+        Q_EMIT q->authenticationComplete();
+    } else if (authenticationUser == "different-prompt") {
+        Q_EMIT q->showPrompt("Secret word： ", Greeter::PromptTypeSecret);
+    } else {
+        Q_EMIT q->showPrompt("Password: ", Greeter::PromptTypeSecret);
+    }
+}
+
+void GreeterPrivate::handleRespond(QString const &response)
+{
+    Q_Q(Greeter);
+
+    if (mockMode == "single") {
+        // NOOP
+    } else if (mockMode == "single-passphrase") {
+        authenticated = (response == "password");
+        q->sendAuthenticationComplete();
+    } else if (mockMode == "single-pin") {
+        authenticated = (response == "1234");
+        q->sendAuthenticationComplete();
+    } else if (mockMode == "full") {
+        handleRespond_full(response);
+    }
+}
+
+void GreeterPrivate::handleRespond_full(const QString &response)
+{
+    Q_Q(Greeter);
+
+    if (authenticationUser == "no-response")
+        return;
+    else if (authenticationUser == "two-factor") {
+        if (!twoFactorDone) {
+            if (response == "password") {
+                twoFactorDone = true;
+                Q_EMIT q->showPrompt("otp", Greeter::PromptTypeQuestion);
+            } else {
+                authenticated = false;
+                q->sendAuthenticationComplete();
+            }
+        } else {
+            authenticated = (response == "otp");
+            q->sendAuthenticationComplete();
+        }
+        return;
+    }
+
+    if (authenticationUser == "has-pin") {
+        authenticated = (response == "1234");
+    } else {
+        authenticated = (response == "password");
+    }
+    q->sendAuthenticationComplete();
+}
+
+}

=== renamed file 'tests/mocks/LightDM/GreeterPrivate.h' => 'tests/mocks/LightDM/liblightdm/GreeterPrivate.h'
--- tests/mocks/LightDM/GreeterPrivate.h	2014-07-01 20:21:23 +0000
+++ tests/mocks/LightDM/liblightdm/GreeterPrivate.h	2015-02-02 14:28:47 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013 Canonical, Ltd.
+ * Copyright (C) 2014 Canonical, Ltd.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -12,8 +12,6 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Author: Michael Terry <[e-mail]>
  */
 
 #ifndef UNITY_MOCK_GREETER_PRIVATE_H
@@ -37,6 +35,8 @@
     QString authenticationUser;
     bool twoFactorDone;
 
+    QString mockMode;
+
     void handleAuthenticate();
     void handleRespond(const QString &response);
 
@@ -45,6 +45,8 @@
     Greeter * const q_ptr;
 
 private:
+    void handleAuthenticate_full();
+    void handleRespond_full(const QString &response);
     Q_DECLARE_PUBLIC(Greeter)
 };
 }

=== renamed file 'tests/mocks/LightDM/UsersModel.cpp' => 'tests/mocks/LightDM/liblightdm/UsersModel.cpp'
--- tests/mocks/LightDM/UsersModel.cpp	2013-06-05 22:03:08 +0000
+++ tests/mocks/LightDM/liblightdm/UsersModel.cpp	2015-02-02 14:28:47 +0000
@@ -114,4 +114,21 @@
     }
 }
 
+QString UsersModel::mockMode() const
+{
+    Q_D(const UsersModel);
+    return d->mockMode;
+}
+
+void UsersModel::setMockMode(QString mockMode)
+{
+    Q_D(UsersModel);
+
+    if (d->mockMode != mockMode) {
+        d->mockMode = mockMode;
+        Q_EMIT mockModeChanged(mockMode);
+        d->resetEntries();
+    }
+}
+
 }

=== renamed file 'tests/mocks/LightDM/UsersModel.h' => 'tests/mocks/LightDM/liblightdm/UsersModel.h'
--- tests/mocks/LightDM/UsersModel.h	2013-06-05 22:03:08 +0000
+++ tests/mocks/LightDM/liblightdm/UsersModel.h	2015-02-02 14:28:47 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013 Canonical, Ltd.
+ * Copyright (C) 2013-2014 Canonical, Ltd.
  * Copyright (C) 2010-2011 David Edmundson.
  *
  * This program is free software; you can redistribute it and/or modify
@@ -13,8 +13,6 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Author: David Edmundson <[e-mail]>
  */
 
 #ifndef UNITY_MOCK_USERSMODEL_H
@@ -35,6 +33,12 @@
 
     Q_ENUMS(UserModelRoles)
 
+    //Mock-only API for testing purposes
+    Q_PROPERTY(QString mockMode READ mockMode WRITE setMockMode NOTIFY mockModeChanged)
+
+Q_SIGNALS:
+    void mockModeChanged(QString mode);
+
 public:
     explicit UsersModel(QObject *parent = 0);
     virtual ~UsersModel();
@@ -52,6 +56,9 @@
     int rowCount(const QModelIndex &parent) const;
     QVariant data(const QModelIndex &index, int role) const;
 
+    QString mockMode() const;
+    void setMockMode(QString mockMode);
+
 private:
     UsersModelPrivate * const d_ptr;
     Q_DECLARE_PRIVATE(UsersModel)

=== added file 'tests/mocks/LightDM/liblightdm/UsersModelPrivate.cpp'
--- tests/mocks/LightDM/liblightdm/UsersModelPrivate.cpp	1970-01-01 00:00:00 +0000
+++ tests/mocks/LightDM/liblightdm/UsersModelPrivate.cpp	2015-02-02 14:28:47 +0000
@@ -0,0 +1,104 @@
+/*
+ * Copyright (C) 2014 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "UsersModelPrivate.h"
+#include "UsersModel.h"
+
+namespace QLightDM
+{
+
+UsersModelPrivate::UsersModelPrivate(UsersModel* parent)
+  : mockMode("single")
+  , q_ptr(parent)
+{
+    char *envMockMode = getenv("LIBLIGHTDM_MOCK_MODE");
+    if (envMockMode) {
+        mockMode = envMockMode;
+    }
+    resetEntries();
+}
+
+void UsersModelPrivate::resetEntries()
+{
+    Q_Q(UsersModel);
+
+    q->beginResetModel();
+
+    if (mockMode == "single") {
+        resetEntries_single();
+    } else if (mockMode == "single-passphrase") {
+        resetEntries_singlePassphrase();
+    } else if (mockMode == "single-pin") {
+        resetEntries_singlePin();
+    } else if (mockMode == "full") {
+        resetEntries_full();
+    }
+
+    q->endResetModel();
+}
+
+void UsersModelPrivate::resetEntries_single()
+{
+    entries =
+    {
+        { "single", "Single User", 0, 0, false, false, 0, 0 },
+    };
+}
+
+void UsersModelPrivate::resetEntries_singlePassphrase()
+{
+    entries =
+    {
+        { "single", "Single User", 0, 0, false, false, 0, 0 },
+    };
+}
+
+void UsersModelPrivate::resetEntries_singlePin()
+{
+    entries =
+    {
+        { "has-pin", "Has PIN", 0, 0, false, false, 0, 0 },
+    };
+}
+
+void UsersModelPrivate::resetEntries_full()
+{
+    entries =
+    {
+        { "has-password",      "Has Password", 0, 0, false, false, 0, 0 },
+        { "has-pin",           "Has PIN",      0, 0, false, false, 0, 0 },
+        { "different-prompt",  "Different Prompt", 0, 0, false, false, 0, 0 },
+        { "no-password",       "No Password", 0, 0, false, false, 0, 0 },
+        { "auth-error",        "Auth Error", 0, 0, false, false, 0, 0 },
+        { "two-factor",        "Two Factor", 0, 0, false, false, 0, 0 },
+        { "info-prompt",       "Info Prompt", 0, 0, false, false, 0, 0 },
+        { "html-info-prompt",  "HTML Info Prompt", 0, 0, false, false, 0, 0 },
+        { "long-info-prompt",  "Long Info Prompt", 0, 0, false, false, 0, 0 },
+        { "wide-info-prompt",  "Wide Info Prompt", 0, 0, false, false, 0, 0 },
+        { "multi-info-prompt", "Multi Info Prompt", 0, 0, false, false, 0, 0 },
+        { "long-name",         "Long name (far far too long to fit)", 0, 0, false, false, 0, 0 },
+        { "color-background",  "Color Background", "#dd4814", 0, false, false, 0, 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, 0, 0 },
+        { "black-background",  "Black Background", "#000000", 0, false, false, 0, 0 },
+        { "no-background",     "No Background", "", 0, false, false, 0, 0 },
+        { "unicode",           "가나다라마", 0, 0, false, false, 0, 0 },
+        { "no-response",       "No Response", 0, 0, false, false, 0, 0 },
+        { "empty-name",        "", 0, 0, false, false, 0, 0 },
+    };
+}
+
+} // namespace QLightDM

=== renamed file 'tests/mocks/LightDM/UsersModelPrivate.h' => 'tests/mocks/LightDM/liblightdm/UsersModelPrivate.h'
--- tests/mocks/LightDM/UsersModelPrivate.h	2013-06-05 22:03:08 +0000
+++ tests/mocks/LightDM/liblightdm/UsersModelPrivate.h	2015-02-02 14:28:47 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013 Canonical, Ltd.
+ * Copyright (C) 2014 Canonical, Ltd.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -12,8 +12,6 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Author: Michael Terry <[e-mail]>
  */
 
 #ifndef UNITY_MOCK_USERSMODEL_PRIVATE_H
@@ -46,11 +44,17 @@
     virtual ~UsersModelPrivate() = default;
 
     QList<Entry> entries;
+    QString mockMode;
 
+    void resetEntries();
 protected:
     UsersModel * const q_ptr;
 
 private:
+    void resetEntries_single();
+    void resetEntries_singlePassphrase();
+    void resetEntries_singlePin();
+    void resetEntries_full();
     Q_DECLARE_PUBLIC(UsersModel)
 };
 

=== added file 'tests/mocks/LightDM/plugin.cpp'
--- tests/mocks/LightDM/plugin.cpp	1970-01-01 00:00:00 +0000
+++ tests/mocks/LightDM/plugin.cpp	2015-02-02 14:28:47 +0000
@@ -0,0 +1,68 @@
+/*
+ * Copyright (C) 2014 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "plugin.h"
+#include <DBusGreeter.h>
+#include <DBusGreeterList.h>
+#include "MockGreeter.h"
+#include "MockUsersModel.h"
+#include <libusermetricsoutput/ColorTheme.h>
+#include <libusermetricsoutput/UserMetrics.h>
+#include <QLightDM/UsersModel>
+
+#include <QAbstractItemModel>
+#include <QDBusConnection>
+#include <QtQml/qqml.h>
+
+static QObject *greeter_provider(QQmlEngine *engine, QJSEngine *scriptEngine)
+{
+    Q_UNUSED(engine)
+    Q_UNUSED(scriptEngine)
+
+    MockGreeter *greeter = new MockGreeter;
+    new DBusGreeter(greeter, "/");
+    new DBusGreeterList(greeter, "/list");
+
+    return greeter;
+}
+
+static QObject *users_provider(QQmlEngine *engine, QJSEngine *scriptEngine)
+{
+    Q_UNUSED(engine)
+    Q_UNUSED(scriptEngine)
+    return new MockUsersModel;
+}
+
+static QObject *infographic_provider(QQmlEngine *engine, QJSEngine *scriptEngine)
+{
+    Q_UNUSED(engine)
+    Q_UNUSED(scriptEngine)
+    return UserMetricsOutput::UserMetrics::getInstance();
+}
+
+void LightDMPlugin::registerTypes(const char *uri)
+{
+    qmlRegisterType<QAbstractItemModel>();
+    qmlRegisterType<UserMetricsOutput::ColorTheme>();
+
+    Q_ASSERT(uri == QLatin1String("LightDM"));
+    qRegisterMetaType<QLightDM::Greeter::MessageType>("QLightDM::Greeter::MessageType");
+    qRegisterMetaType<QLightDM::Greeter::PromptType>("QLightDM::Greeter::PromptType");
+    qmlRegisterSingletonType<MockGreeter>(uri, 0, 1, "Greeter", greeter_provider);
+    qmlRegisterSingletonType<MockUsersModel>(uri, 0, 1, "Users", users_provider);
+    qmlRegisterUncreatableType<QLightDM::UsersModel>(uri, 0, 1, "UserRoles", "Type is not instantiable");
+    qmlRegisterSingletonType<UserMetricsOutput::UserMetrics>(uri, 0, 1, "Infographic", infographic_provider);
+}

=== added file 'tests/mocks/LightDM/plugin.h'
--- tests/mocks/LightDM/plugin.h	1970-01-01 00:00:00 +0000
+++ tests/mocks/LightDM/plugin.h	2015-02-02 14:28:47 +0000
@@ -0,0 +1,32 @@
+/*
+ * Copyright (C) 2014 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef MOCK_LIGHTDM_PLUGIN_H
+#define MOCK_LIGHTDM_PLUGIN_H
+
+#include <QtQml/QQmlEngine>
+#include <QtQml/QQmlExtensionPlugin>
+
+class LightDMPlugin : public QQmlExtensionPlugin
+{
+    Q_OBJECT
+    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")
+
+public:
+    void registerTypes(const char *uri);
+};
+
+#endif

=== removed directory 'tests/mocks/LightDM/single'
=== removed directory 'tests/mocks/LightDM/single-passphrase'
=== removed file 'tests/mocks/LightDM/single-passphrase/CMakeLists.txt'
--- tests/mocks/LightDM/single-passphrase/CMakeLists.txt	2014-06-11 15:36:51 +0000
+++ tests/mocks/LightDM/single-passphrase/CMakeLists.txt	1970-01-01 00:00:00 +0000
@@ -1,19 +0,0 @@
-set(LibLightDM_SOURCES
-    ../Greeter.cpp
-    ../UsersModel.cpp
-    GreeterPrivate.cpp
-    UsersModelPrivate.cpp
-    ${CMAKE_SOURCE_DIR}/plugins/Utils/qvariantlistmodel.cpp
-    )
-
-
-add_library(MockLightDM-single-passphrase SHARED ${LibLightDM_SOURCES})
-
-qt5_use_modules(MockLightDM-single-passphrase Gui)
-
-set_target_properties(MockLightDM-single-passphrase PROPERTIES
-                      OUTPUT_NAME lightdm-qt5-2)
-
-install(TARGETS MockLightDM-single-passphrase
-    DESTINATION ${SHELL_INSTALL_QML}/mocks/LightDM/single-passphrase
-    )

=== removed file 'tests/mocks/LightDM/single-passphrase/GreeterPrivate.cpp'
--- tests/mocks/LightDM/single-passphrase/GreeterPrivate.cpp	2014-08-06 15:27:57 +0000
+++ tests/mocks/LightDM/single-passphrase/GreeterPrivate.cpp	1970-01-01 00:00:00 +0000
@@ -1,46 +0,0 @@
-/*
- * Copyright (C) 2013 Canonical, Ltd.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Author: Michael Terry <[e-mail]>
- */
-
-#include "../Greeter.h"
-#include "../GreeterPrivate.h"
-
-namespace QLightDM
-{
-
-GreeterPrivate::GreeterPrivate(Greeter* parent)
-  : authenticated(false),
-    authenticationUser(),
-    q_ptr(parent)
-{
-}
-
-void GreeterPrivate::handleAuthenticate()
-{
-    Q_Q(Greeter);
-    Q_EMIT q->showPrompt("Password: ", Greeter::PromptTypeSecret);
-}
-
-void GreeterPrivate::handleRespond(const QString &response)
-{
-    Q_Q(Greeter);
-
-    authenticated = (response == "password");
-    q->sendAuthenticationComplete();
-}
-
-}

=== removed file 'tests/mocks/LightDM/single-passphrase/UsersModelPrivate.cpp'
--- tests/mocks/LightDM/single-passphrase/UsersModelPrivate.cpp	2013-06-14 19:35:25 +0000
+++ tests/mocks/LightDM/single-passphrase/UsersModelPrivate.cpp	1970-01-01 00:00:00 +0000
@@ -1,33 +0,0 @@
-/*
- * Copyright (C) 2013 Canonical, Ltd.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Author: Michael Terry <[e-mail]>
- */
-
-#include "../UsersModelPrivate.h"
-
-namespace QLightDM
-{
-
-UsersModelPrivate::UsersModelPrivate(UsersModel* parent)
-  : q_ptr(parent)
-{
-    entries =
-    {
-        { "single", "Has Passphrase", 0, 0, false, false, 0, 0 },
-    };
-}
-
-}

=== removed directory 'tests/mocks/LightDM/single-pin'
=== removed file 'tests/mocks/LightDM/single-pin/CMakeLists.txt'
--- tests/mocks/LightDM/single-pin/CMakeLists.txt	2014-06-11 15:36:51 +0000
+++ tests/mocks/LightDM/single-pin/CMakeLists.txt	1970-01-01 00:00:00 +0000
@@ -1,19 +0,0 @@
-set(LibLightDM_SOURCES
-    ../Greeter.cpp
-    ../UsersModel.cpp
-    GreeterPrivate.cpp
-    UsersModelPrivate.cpp
-    ${CMAKE_SOURCE_DIR}/plugins/Utils/qvariantlistmodel.cpp
-    )
-
-
-add_library(MockLightDM-single-pin SHARED ${LibLightDM_SOURCES})
-
-qt5_use_modules(MockLightDM-single-pin Gui)
-
-set_target_properties(MockLightDM-single-pin PROPERTIES
-                      OUTPUT_NAME lightdm-qt5-2)
-
-install(TARGETS MockLightDM-single-pin
-    DESTINATION ${SHELL_INSTALL_QML}/mocks/LightDM/single-pin
-    )

=== removed file 'tests/mocks/LightDM/single-pin/GreeterPrivate.cpp'
--- tests/mocks/LightDM/single-pin/GreeterPrivate.cpp	2014-08-06 15:27:57 +0000
+++ tests/mocks/LightDM/single-pin/GreeterPrivate.cpp	1970-01-01 00:00:00 +0000
@@ -1,46 +0,0 @@
-/*
- * Copyright (C) 2013 Canonical, Ltd.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Author: Michael Terry <[e-mail]>
- */
-
-#include "../Greeter.h"
-#include "../GreeterPrivate.h"
-
-namespace QLightDM
-{
-
-GreeterPrivate::GreeterPrivate(Greeter* parent)
-  : authenticated(false),
-    authenticationUser(),
-    q_ptr(parent)
-{
-}
-
-void GreeterPrivate::handleAuthenticate()
-{
-    Q_Q(Greeter);
-    Q_EMIT q->showPrompt("Password: ", Greeter::PromptTypeSecret);
-}
-
-void GreeterPrivate::handleRespond(const QString &response)
-{
-    Q_Q(Greeter);
-
-    authenticated = (response == "1234");
-    q->sendAuthenticationComplete();
-}
-
-}

=== removed file 'tests/mocks/LightDM/single-pin/UsersModelPrivate.cpp'
--- tests/mocks/LightDM/single-pin/UsersModelPrivate.cpp	2014-07-02 16:17:14 +0000
+++ tests/mocks/LightDM/single-pin/UsersModelPrivate.cpp	1970-01-01 00:00:00 +0000
@@ -1,33 +0,0 @@
-/*
- * Copyright (C) 2013 Canonical, Ltd.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Author: Michael Terry <[e-mail]>
- */
-
-#include "../UsersModelPrivate.h"
-
-namespace QLightDM
-{
-
-UsersModelPrivate::UsersModelPrivate(UsersModel* parent)
-  : q_ptr(parent)
-{
-    entries =
-    {
-        { "has-pin", "Has PIN", 0, 0, false, false, 0, 0 },
-    };
-}
-
-}

=== removed file 'tests/mocks/LightDM/single/CMakeLists.txt'
--- tests/mocks/LightDM/single/CMakeLists.txt	2014-06-11 15:36:51 +0000
+++ tests/mocks/LightDM/single/CMakeLists.txt	1970-01-01 00:00:00 +0000
@@ -1,18 +0,0 @@
-set(LibLightDM_SOURCES
-    ../Greeter.cpp
-    ../UsersModel.cpp
-    GreeterPrivate.cpp
-    UsersModelPrivate.cpp
-    ${CMAKE_SOURCE_DIR}/plugins/Utils/qvariantlistmodel.cpp
-    )
-
-add_library(MockLightDM-single SHARED ${LibLightDM_SOURCES})
-
-qt5_use_modules(MockLightDM-single Gui)
-
-set_target_properties(MockLightDM-single PROPERTIES
-                      OUTPUT_NAME lightdm-qt5-2)
-
-install(TARGETS MockLightDM-single
-    DESTINATION ${SHELL_INSTALL_QML}/mocks/LightDM/single
-    )

=== removed file 'tests/mocks/LightDM/single/GreeterPrivate.cpp'
--- tests/mocks/LightDM/single/GreeterPrivate.cpp	2013-07-29 22:16:04 +0000
+++ tests/mocks/LightDM/single/GreeterPrivate.cpp	1970-01-01 00:00:00 +0000
@@ -1,46 +0,0 @@
-/*
- * Copyright (C) 2013 Canonical, Ltd.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Author: Michael Terry <[e-mail]>
- */
-
-#include "../Greeter.h"
-#include "../GreeterPrivate.h"
-
-namespace QLightDM
-{
-
-GreeterPrivate::GreeterPrivate(Greeter* parent)
-  : authenticated(false),
-    authenticationUser(),
-    twoFactorDone(false),
-    q_ptr(parent)
-{
-}
-
-void GreeterPrivate::handleAuthenticate()
-{
-    Q_Q(Greeter);
-
-    authenticated = true;
-    Q_EMIT q->authenticationComplete();
-}
-
-void GreeterPrivate::handleRespond(QString const &response)
-{
-    Q_UNUSED(response)
-}
-
-}

=== removed file 'tests/mocks/LightDM/single/UsersModelPrivate.cpp'
--- tests/mocks/LightDM/single/UsersModelPrivate.cpp	2013-06-14 19:35:25 +0000
+++ tests/mocks/LightDM/single/UsersModelPrivate.cpp	1970-01-01 00:00:00 +0000
@@ -1,33 +0,0 @@
-/*
- * Copyright (C) 2013 Canonical, Ltd.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Author: Michael Terry <[e-mail]>
- */
-
-#include "../UsersModelPrivate.h"
-
-namespace QLightDM
-{
-
-UsersModelPrivate::UsersModelPrivate(UsersModel* parent)
-  : q_ptr(parent)
-{
-    entries =
-    {
-        { "single", "Single User", 0, 0, false, false, 0, 0 },
-    };
-}
-
-}

=== modified file 'tests/plugins/LightDM/CMakeLists.txt'
--- tests/plugins/LightDM/CMakeLists.txt	2015-01-22 16:41:18 +0000
+++ tests/plugins/LightDM/CMakeLists.txt	2015-02-02 14:28:47 +0000
@@ -11,10 +11,10 @@
     ${LIBLIGHTDM_INCLUDE_DIRS}
     )
 
-add_dependencies(GreeterDBusTestExec MockLightDM-full)
-target_link_libraries(GreeterDBusTestExec -L${CMAKE_BINARY_DIR}/tests/mocks/LightDM/full
+add_dependencies(GreeterDBusTestExec MockLightDM)
+target_link_libraries(GreeterDBusTestExec -L${CMAKE_BINARY_DIR}/tests/mocks/LightDM/liblightdm
     -llightdm-qt5-2)
 
 add_definitions(-DCURRENT_SOURCE_DIR="${CMAKE_CURRENT_SOURCE_DIR}")
 
-add_binary_qml_test(GreeterDBus "${CMAKE_BINARY_DIR}/tests/mocks/LightDM/full" MockLightDM-full "QML2_IMPORT_PATH=${CMAKE_BINARY_DIR}/tests/mocks")
+add_binary_qml_test(GreeterDBus "${CMAKE_BINARY_DIR}/tests/mocks/LightDM/liblightdm" MockLightDM "QML2_IMPORT_PATH=${CMAKE_BINARY_DIR}/tests/mocks")

=== modified file 'tests/plugins/LightDM/greeter.qml'
--- tests/plugins/LightDM/greeter.qml	2013-12-03 11:43:15 +0000
+++ tests/plugins/LightDM/greeter.qml	2015-02-02 14:28:47 +0000
@@ -19,4 +19,9 @@
 
 Item {
     property var greeter: LightDM.Greeter
+    Binding {
+        target: LightDM.Greeter
+        property: "mockMode"
+        value: "full"
+    }
 }

=== modified file 'tests/qmltests/CMakeLists.txt'
--- tests/qmltests/CMakeLists.txt	2015-01-21 18:32:48 +0000
+++ tests/qmltests/CMakeLists.txt	2015-02-02 14:28:47 +0000
@@ -16,11 +16,11 @@
 
 set(qmltest_DEFAULT_TARGETS qmluitests)
 set(qmltest_DEFAULT_NO_ADD_TEST TRUE)
-set(qmltest_DEFAULT_PROPERTIES ENVIRONMENT "LC_ALL=C")
+set(qmltest_DEFAULT_PROPERTIES ENVIRONMENT "LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/tests/mocks/libusermetrics:${CMAKE_BINARY_DIR}/tests/mocks/LightDM/liblightdm:${CMAKE_BINARY_DIR}/tests/mocks/QMenuModel")
 
-add_qml_test(. Shell ENVIRONMENT "LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/tests/mocks/LightDM/single:${CMAKE_BINARY_DIR}/tests/mocks/QMenuModel")
-add_qml_test(. ShellWithPin ENVIRONMENT "LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/tests/mocks/LightDM/single-pin:${CMAKE_BINARY_DIR}/tests/mocks/QMenuModel")
-add_qml_test(. TabletShell ENVIRONMENT "LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/tests/mocks/LightDM/full:${CMAKE_BINARY_DIR}/tests/mocks/QMenuModel")
+add_qml_test(. Shell)
+add_qml_test(. ShellWithPin)
+add_qml_test(. TabletShell)
 add_qml_test(Components Background)
 add_qml_test(Components Carousel)
 add_qml_test(Components Dialogs)
@@ -61,10 +61,10 @@
 add_qml_test(Dash/ScopeSettings ScopeSettingNumber)
 add_qml_test(Dash/ScopeSettings ScopeSettingString)
 add_qml_test(Dash/ScopeSettings ScopeSettingsWidgetFactory)
-add_qml_test(Greeter MultiGreeter ENVIRONMENT "LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/tests/mocks/libusermetrics:${CMAKE_BINARY_DIR}/tests/mocks/LightDM/full")
-add_qml_test(Greeter SingleGreeter ENVIRONMENT "LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/tests/mocks/libusermetrics:${CMAKE_BINARY_DIR}/tests/mocks/LightDM/single")
-add_qml_test(Greeter Infographics ENVIRONMENT "LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/tests/mocks/libusermetrics:${CMAKE_BINARY_DIR}/tests/mocks/LightDM/full")
-add_qml_test(Greeter Clock ENVIRONMENT "LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/tests/mocks/QMenuModel")
+add_qml_test(Greeter MultiGreeter)
+add_qml_test(Greeter SingleGreeter)
+add_qml_test(Greeter Infographics)
+add_qml_test(Greeter Clock)
 add_qml_test(Launcher Launcher)
 add_qml_test(Notifications Notifications)
 add_qml_test(Notifications VisualSnapDecisionsQueue)
@@ -72,22 +72,22 @@
 add_qml_test(Notifications SwipeToAct)
 add_qml_test(Panel ActiveCallHint)
 add_qml_test(Panel IndicatorItem)
-add_qml_test(Panel IndicatorItemRow ENVIRONMENT "LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/tests/mocks/QMenuModel")
-add_qml_test(Panel IndicatorPage ENVIRONMENT "LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/tests/mocks/QMenuModel")
-add_qml_test(Panel IndicatorsBar ENVIRONMENT "LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/tests/mocks/QMenuModel")
-add_qml_test(Panel IndicatorsMenu ENVIRONMENT "LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/tests/mocks/QMenuModel")
-add_qml_test(Panel MenuContent ENVIRONMENT "LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/tests/mocks/QMenuModel")
-add_qml_test(Panel Panel ENVIRONMENT "LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/tests/mocks/QMenuModel")
+add_qml_test(Panel IndicatorItemRow)
+add_qml_test(Panel IndicatorPage)
+add_qml_test(Panel IndicatorsBar)
+add_qml_test(Panel IndicatorsMenu)
+add_qml_test(Panel MenuContent)
+add_qml_test(Panel Panel)
 add_qml_test(Panel SearchIndicator)
 add_qml_test(Panel/Indicators IndicatorsLight ENVIRONMENT "LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/tests/mocks/QMenuModel")
 # These MenuItemFactory tests need the test/mocks/ to come before plugins/
 add_qml_test(Panel/Indicators MenuItemFactory IMPORT_PATHS ${CMAKE_BINARY_DIR}/tests/mocks ${qmltest_DEFAULT_IMPORT_PATHS})
 add_qml_test(Panel/Indicators MessageMenuItemFactory IMPORT_PATHS ${CMAKE_BINARY_DIR}/tests/mocks ${qmltest_DEFAULT_IMPORT_PATHS})
-add_qml_test(Stages ApplicationWindow ENVIRONMENT "LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/tests/mocks/libusermetrics:${CMAKE_BINARY_DIR}/tests/mocks/LightDM/single")
-add_qml_test(Stages PhoneStage ENVIRONMENT "LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/tests/mocks/libusermetrics:${CMAKE_BINARY_DIR}/tests/mocks/LightDM/single")
-add_qml_test(Stages SpreadDelegate ENVIRONMENT "LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/tests/mocks/libusermetrics:${CMAKE_BINARY_DIR}/tests/mocks/LightDM/single")
-add_qml_test(Stages SurfaceContainer ENVIRONMENT "LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/tests/mocks/libusermetrics:${CMAKE_BINARY_DIR}/tests/mocks/LightDM/single")
-add_qml_test(Stages SessionContainer ENVIRONMENT "LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/tests/mocks/libusermetrics:${CMAKE_BINARY_DIR}/tests/mocks/LightDM/single")
+add_qml_test(Stages ApplicationWindow)
+add_qml_test(Stages PhoneStage ENVIRONMENT)
+add_qml_test(Stages SpreadDelegate ENVIRONMENT)
+add_qml_test(Stages SurfaceContainer ENVIRONMENT)
+add_qml_test(Stages SessionContainer ENVIRONMENT)
 add_qml_test(Stages WindowMoveResizeArea)
 add_qml_test(Stages Splash)
 add_qml_test(Wizard Wizard)

=== modified file 'tests/qmltests/Greeter/tst_Infographics.qml'
--- tests/qmltests/Greeter/tst_Infographics.qml	2013-12-17 16:04:47 +0000
+++ tests/qmltests/Greeter/tst_Infographics.qml	2015-02-02 14:28:47 +0000
@@ -23,6 +23,16 @@
 import LightDM 0.1 as LightDM
 
 Item {
+    Binding {
+        target: LightDM.Greeter
+        property: "mockMode"
+        value: "full"
+    }
+    Binding {
+        target: LightDM.Users
+        property: "mockMode"
+        value: "full"
+    }
     property variant infographicModel: LightDM.Infographic
 
     width: units.gu(120)

=== modified file 'tests/qmltests/Greeter/tst_MultiGreeter.qml'
--- tests/qmltests/Greeter/tst_MultiGreeter.qml	2014-12-09 14:50:59 +0000
+++ tests/qmltests/Greeter/tst_MultiGreeter.qml	2015-02-02 14:28:47 +0000
@@ -15,6 +15,7 @@
  */
 
 import QtQuick 2.0
+import QtQuick.Layouts 1.1
 import QtTest 1.0
 import ".."
 import "../../../qml/Greeter"
@@ -23,12 +24,37 @@
 import Unity.Test 0.1 as UT
 
 Item {
-    width: units.gu(120)
+    id: root
+    width: units.gu(140)
     height: units.gu(80)
 
+    QtObject {
+        id: fakeInputMethod
+        property bool visible: fakeKeyboard.visible
+        property var keyboardRectangle: QtObject {
+            property real x: fakeKeyboard.x
+            property real y: fakeKeyboard.y
+            property real width: fakeKeyboard.width
+            property real height: fakeKeyboard.height
+        }
+    }
+
+    Binding {
+        target: LightDM.Greeter
+        property: "mockMode"
+        value: "full"
+    }
+    Binding {
+        target: LightDM.Users
+        property: "mockMode"
+        value: "full"
+    }
+
     Greeter {
         id: greeter
-        anchors.fill: parent
+        width: units.gu(120)
+        height: root.height
+        inputMethod: fakeInputMethod
         locked: !LightDM.Greeter.authenticated
     }
 
@@ -43,6 +69,44 @@
         }
     }
 
+    Rectangle {
+        id: fakeKeyboard
+        color: "green"
+        opacity: 0.7
+        anchors.bottom: root.bottom
+        width: greeter.width
+        height: greeter.height * 0.6
+        visible: keyboardVisibleCheckbox.checked
+        Text {
+            text: "Keyboard Rectangle"
+            color: "yellow"
+            font.bold: true
+            fontSizeMode: Text.Fit
+            minimumPixelSize: 10; font.pixelSize: 200
+            verticalAlignment: Text.AlignVCenter
+            x: (parent.width - width) / 2
+            y: (parent.height - height) / 2
+            width: parent.width
+            height: parent.height
+        }
+    }
+
+    Item {
+        anchors {
+            top: root.top
+            bottom: root.bottom
+            left: greeter.right
+            right: root.right
+        }
+        RowLayout {
+            Layout.fillWidth: true
+            CheckBox {
+                id: keyboardVisibleCheckbox
+            }
+            Label { text: "Keyboard Visible"; anchors.verticalCenter: parent.verticalCenter }
+        }
+    }
+
     SignalSpy {
         id: unlockSpy
         target: greeter
@@ -65,6 +129,10 @@
         name: "MultiGreeter"
         when: windowShown
 
+        function cleanup() {
+            keyboardVisibleCheckbox.checked = false;
+        }
+
         function select_index(i) {
             // We could be anywhere in list; find target index to know which direction
             var userlist = findChild(greeter, "userList")
@@ -382,5 +450,26 @@
             tryCompare(spy, "count", 1)
             greeterObj.destroy()
         }
+
+        function test_login_list_not_covered_by_keyboard() {
+            var loginList = findChild(greeter, "loginLoader").item;
+            compare(loginList.height, greeter.height);
+
+            // when the vkb shows up, loginList is moved up to remain fully uncovered
+
+            keyboardVisibleCheckbox.checked = true;
+
+            tryCompare(loginList, "height", greeter.height - fakeInputMethod.keyboardRectangle.height);
+            tryCompareFunction( function() {
+                var loginListRect = loginList.mapToItem(greeter, 0, 0, loginList.width, loginList.height);
+                return loginListRect.y + loginListRect.height <= fakeInputMethod.keyboardRectangle.y;
+            }, true);
+
+            // once the vkb goes away, loginList goes back to its full height
+
+            keyboardVisibleCheckbox.checked = false;
+
+            tryCompare(loginList, "height", greeter.height);
+        }
     }
 }

=== modified file 'tests/qmltests/tst_Shell.qml'
--- tests/qmltests/tst_Shell.qml	2015-01-09 10:42:42 +0000
+++ tests/qmltests/tst_Shell.qml	2015-02-02 14:28:47 +0000
@@ -36,6 +36,13 @@
     width: units.gu(60)
     height: units.gu(71)
 
+    Component.onCompleted: {
+        // must set the mock mode before loading the Shell
+        LightDM.Greeter.mockMode = "single";
+        LightDM.Users.mockMode = "single";
+        shellLoader.active = true;
+    }
+
     QtObject {
         id: applicationArguments
 
@@ -56,7 +63,7 @@
         anchors.fill: parent
         Loader {
             id: shellLoader
-
+            active: false
             property bool itemDestroyed: false
             sourceComponent: Component {
                 Shell {

=== modified file 'tests/qmltests/tst_ShellWithPin.qml'
--- tests/qmltests/tst_ShellWithPin.qml	2014-12-09 17:14:35 +0000
+++ tests/qmltests/tst_ShellWithPin.qml	2015-02-02 14:28:47 +0000
@@ -33,6 +33,13 @@
     width: contentRow.width
     height: contentRow.height
 
+    Component.onCompleted: {
+        // must set the mock mode before loading the Shell
+        LightDM.Greeter.mockMode = "single-pin";
+        LightDM.Users.mockMode = "single-pin";
+        shellLoader.active = true;
+    }
+
     QtObject {
         id: applicationArguments
 
@@ -54,6 +61,7 @@
 
         Loader {
             id: shellLoader
+            active: false
 
             width: units.gu(40)
             height: units.gu(71)

=== modified file 'tests/qmltests/tst_TabletShell.qml'
--- tests/qmltests/tst_TabletShell.qml	2015-01-09 09:15:45 +0000
+++ tests/qmltests/tst_TabletShell.qml	2015-02-02 14:28:47 +0000
@@ -32,6 +32,13 @@
     id: root
     spacing: 0
 
+    Component.onCompleted: {
+        // must set the mock mode before loading the Shell
+        LightDM.Greeter.mockMode = "full";
+        LightDM.Users.mockMode = "full";
+        shellLoader.active = true;
+    }
+
     QtObject {
         id: applicationArguments
 
@@ -51,6 +58,7 @@
     Loader {
         id: shellLoader
 
+        active: false
         width: units.gu(100)
         height: units.gu(80)