git.iko.soy/unity8
on xenial help sign in
Merge prereq
commit6ec76ab465f0cdc6938dc0eb58fb7d5b83324802 authorJosh Arenson <joshua.arenson@canonical.com> dateTue 14 Jun 2016, 10:56 (10 years ago) parenta58047e3e1d2a3
3 files changed+6−16
compare with xenial
unifiedsplit
data/unity8-greeter-wrapper+1−1 qml/Greeter/Greeter.qml+1−3 tests/qmltests/tst_Shell.qml+4−12
data/unity8-greeter-wrapper+1−1
@@ -62,7 +62,7 @@ set_greeter_var PA_DISABLED 1
6262# creates for them and don't want to start all the services that a normal
6363# session would. So it's inconvenient to live within an upstart session.
6464# But... we still want to use Upstart for some services. So launch here.
65−USC_SOCKET=$MIR_SOCKET MIR_SOCKET=$SUB_SOCKET $TOUCH_WRAPPER /sbin/upstart --user --no-startup-event &
65+MIR_SOCKET=$SUB_SOCKET $TOUCH_WRAPPER /sbin/upstart --user --no-startup-event &
6666INIT_PID=$!
6767while [ ! -e "$XDG_RUNTIME_DIR/upstart/sessions/$INIT_PID.session" ]; do sleep 0.1; done
6868export UPSTART_SESSION=$(/sbin/initctl list-sessions | grep "^$INIT_PID " | cut -d' ' -f2)
qml/Greeter/Greeter.qml+1−3
@@ -307,9 +307,7 @@ Showable {
307307 if (root.locked) {
308308 LightDMService.greeter.respond(response);
309309 } else {
310− if (LightDMService.greeter.active && !LightDMService.greeter.authenticated) { // could happen if forcedUnlock
311− d.login();
312− }
310+ d.login();
313311 loader.item.hide();
314312 }
315313 }
tests/qmltests/tst_Shell.qml+4−12
@@ -1142,16 +1142,13 @@ Rectangle {
11421142
11431143 function test_greeterLoginsAutomaticallyWhenNoPasswordSet() {
11441144 loadShell("phone");
1145− swipeAwayGreeter();
1146−
1147− sessionSpy.clear();
1148− verify(sessionSpy.valid);
1149−
1150− showGreeter();
11511145
11521146 var greeter = findChild(shell, "greeter");
11531147 verify(!greeter.locked);
1154− verify(sessionSpy.count > 0);
1148+ compare(sessionSpy.count, 0);
1149+
1150+ swipeAwayGreeter();
1151+ compare(sessionSpy.count, 1);
11551152 }
11561153
11571154 function test_fullscreen() {
@@ -2189,11 +2186,6 @@ Rectangle {
21892186 shell.usageScenario = "desktop";
21902187 GSettingsController.setAutohideLauncher(!data.launcherLocked);
21912188 waitForRendering(shell);
2192− // Not sure why 2 but it's the number of times
2193− // it triggers at this time and we need to wait
2194− // for them otherwise a sessionStarted signal will
2195− // hide the launcher and make the test fail
2196− tryCompare(sessionSpy, "count", 2);
21972189
21982190 var launcher = findChild(shell, "launcher");
21992191 var launcherPanel = findChild(launcher, "launcherPanel");