1
=== modified file 'tests/mocks/LightDM/Greeter.cpp'
2
--- tests/mocks/LightDM/Greeter.cpp	2014-07-31 15:59:04 +0000
3
+++ tests/mocks/LightDM/Greeter.cpp	2014-12-11 15:54:52 +0000
4
@@ -129,6 +129,12 @@
5
129
    d->authenticated = false;
129
    d->authenticated = false;
6
130
    d->authenticationUser = username;
130
    d->authenticationUser = username;
7
131
    d->twoFactorDone = false;
131
    d->twoFactorDone = false;
8
132
    QTimer::singleShot(0, this, SLOT(delayedAuthentication()));
9
133
}
10
134
11
135
void Greeter::delayedAuthentication()
12
136
{
13
137
    Q_D(Greeter);
14
132
    d->handleAuthenticate();
138
    d->handleAuthenticate();
15
133
}
139
}
16
134
140
17
135
141
18
=== modified file 'tests/mocks/LightDM/Greeter.h'
19
--- tests/mocks/LightDM/Greeter.h	2014-07-31 15:59:04 +0000
20
+++ tests/mocks/LightDM/Greeter.h	2014-12-11 15:54:52 +0000
21
@@ -99,6 +99,9 @@
22
99
protected:
99
protected:
23
100
    void sendAuthenticationComplete();
100
    void sendAuthenticationComplete();
24
101
101
25
102
private Q_SLOTS:
26
103
    void delayedAuthentication();
27
104
28
102
private:
105
private:
29
103
    GreeterPrivate *d_ptr;
106
    GreeterPrivate *d_ptr;
30
104
    Q_DECLARE_PRIVATE(Greeter)
107
    Q_DECLARE_PRIVATE(Greeter)
31
105
108
32
=== modified file 'tests/plugins/LightDM/dbus.cpp'
33
--- tests/plugins/LightDM/dbus.cpp	2014-12-11 15:54:52 +0000
34
+++ tests/plugins/LightDM/dbus.cpp	2014-12-11 15:54:52 +0000
35
@@ -16,6 +16,7 @@
36
16
16
37
17
#include "Greeter.h"
17
#include "Greeter.h"
38
18
18
39
19
#include <QCoreApplication>
40
19
#include <QDBusInterface>
20
#include <QDBusInterface>
41
20
#include <QDBusReply>
21
#include <QDBusReply>
42
21
#include <QSignalSpy>
22
#include <QSignalSpy>
43
@@ -149,9 +150,11 @@
44
149
        QVERIFY(dbusList->property("EntryIsLocked").toBool());
150
        QVERIFY(dbusList->property("EntryIsLocked").toBool());
45
150
151
46
151
        greeter->authenticate("no-password");
152
        greeter->authenticate("no-password");
47
153
        QCoreApplication::processEvents(); // wait for auth to finish
48
152
        QVERIFY(!dbusList->property("EntryIsLocked").toBool());
154
        QVERIFY(!dbusList->property("EntryIsLocked").toBool());
49
153
155
50
154
        greeter->authenticate("has-password");
156
        greeter->authenticate("has-password");
51
157
        QCoreApplication::processEvents(); // wait for auth to finish
52
155
        QVERIFY(dbusList->property("EntryIsLocked").toBool());
158
        QVERIFY(dbusList->property("EntryIsLocked").toBool());
53
156
    }
159
    }
54
157
160
55
@@ -160,12 +163,12 @@
56
160
        QSignalSpy spy(this, SIGNAL(PropertiesChangedRelay(QString, QVariantMap, QStringList)));
163
        QSignalSpy spy(this, SIGNAL(PropertiesChangedRelay(QString, QVariantMap, QStringList)));
57
161
        greeter->authenticate("no-password");
164
        greeter->authenticate("no-password");
58
162
165
60
163
        // once for locked, once for user; first will be locked mode
166
        // once for user, once for locked; second will be for locked mode
61
164
        while (spy.count() != 2) {
167
        while (spy.count() != 2) {
62
165
            spy.wait();
168
            spy.wait();
63
166
        }
169
        }
64
167
170
66
168
        QList<QVariant> arguments = spy.takeFirst();
171
        QList<QVariant> arguments = spy.takeLast();
67
169
        QVERIFY(arguments.at(0).toString() == "com.canonical.UnityGreeter.List");
172
        QVERIFY(arguments.at(0).toString() == "com.canonical.UnityGreeter.List");
68
170
        QVERIFY(arguments.at(1).toMap().contains("EntryIsLocked"));
173
        QVERIFY(arguments.at(1).toMap().contains("EntryIsLocked"));
69
171
        QVERIFY(arguments.at(1).toMap()["EntryIsLocked"] == false);
174
        QVERIFY(arguments.at(1).toMap()["EntryIsLocked"] == false);
70
172
175
71
=== modified file 'tests/qmltests/tst_ShellWithPin.qml'
72
--- tests/qmltests/tst_ShellWithPin.qml	2014-11-24 14:03:06 +0000
73
+++ tests/qmltests/tst_ShellWithPin.qml	2014-12-11 15:54:52 +0000
74
@@ -116,6 +116,12 @@
75
116
        signalName: "resettingDevice"
116
        signalName: "resettingDevice"
76
117
    }
117
    }
77
118
118
78
119
    SignalSpy {
79
120
        id: promptSpy
80
121
        target: LightDM.Greeter
81
122
        signalName: "showPrompt"
82
123
    }
83
124
84
119
    Telephony.CallEntry {
125
    Telephony.CallEntry {
85
120
        id: phoneCall
126
        id: phoneCall
86
121
        phoneNumber: "+447812221111"
127
        phoneNumber: "+447812221111"
87
@@ -472,5 +478,30 @@
88
472
478
89
473
        }
479
        }
90
474
480
91
481
        /* We had a bug (1395075) where if a user kept swiping as the greeter
92
482
           loaded, they would be able to get into the session before the
93
483
           lockscreen appeared. Make sure that doesn't happen. */
94
484
        function test_earlyDisable() {
95
485
            // Kill current shell
96
486
            shellLoader.itemDestroyed = false;
97
487
            shellLoader.active = false;
98
488
            tryCompare(shellLoader, "itemDestroyed", true);
99
489
            LightDM.Greeter.authenticate(""); // reset greeter
100
490
101
491
            // Create new shell
102
492
            promptSpy.clear();
103
493
            shellLoader.active = true;
104
494
            tryCompareFunction(function() {return shell !== null}, true);
105
495
106
496
            // Confirm that we start disabled
107
497
            compare(promptSpy.count, 0);
108
498
            verify(!shell.enabled);
109
499
110
500
            // And that we only become enabled once the lockscreen is up
111
501
            tryCompare(shell, "enabled", true);
112
502
            verify(promptSpy.count > 0);
113
503
            var lockscreen = findChild(shell, "lockscreen");
114
504
            verify(lockscreen.shown);
115
505
        }
116
475
    }
506
    }
117
476
}
507
}
Status:	Superseded
Proposed branch:	lp:~mterry/unity8/test-early-disable
Merge into:	lp:unity8
Prerequisite:	lp:~mterry/unity8/cleanup-greeter-dbus-test
Diff against target:	117 lines (+45/-2) 4 files modified tests/mocks/LightDM/Greeter.cpp (+6/-0) tests/mocks/LightDM/Greeter.h (+3/-0) tests/plugins/LightDM/dbus.cpp (+5/-2) tests/qmltests/tst_ShellWithPin.qml (+31/-0)
To merge this branch:	bzr merge lp:~mterry/unity8/test-early-disable
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
PS Jenkins bot (community)	continuous-integration	2014-12-11	Approve on 2015-01-08
Albert Astals Cid (community)		2014-12-11	Approve on 2014-12-15
Michał Sawicz		2014-12-11	Pending
Review via email: mp+244461@code.launchpad.net