git.iko.soy/unity8
on xenial help sign in
Try to guard against the shell.enabled logic from biting us
commitc5998b14c34920c6f3bcee3e7af054f0561dbcf7 authorMichael Terry <michael.terry@canonical.com> dateWed 15 Oct 2014, 13:54 (12 years ago) parent560d8b2
3 files changed+10
compare with xenial
unifiedsplit
tests/qmltests/tst_Shell.qml+4 tests/qmltests/tst_ShellWithPin.qml+3 tests/qmltests/tst_TabletShell.qml+3
tests/qmltests/tst_Shell.qml+4
@@ -127,6 +127,8 @@ Row {
127127 property Item shell: shellLoader.status === Loader.Ready ? shellLoader.item : null
128128
129129 function init() {
130+ tryCompare(shell, "enabled", true); // enabled by greeter when ready
131+
130132 swipeAwayGreeter();
131133
132134 sessionSpy.target = findChild(shell, "greeter")
@@ -134,6 +136,8 @@ Row {
134136 }
135137
136138 function cleanup() {
139+ tryCompare(shell, "enabled", true); // make sure greeter didn't leave us in disabled state
140+
137141 shellLoader.itemDestroyed = false;
138142
139143 shellLoader.active = false;
tests/qmltests/tst_ShellWithPin.qml+3
@@ -117,6 +117,7 @@ Row {
117117 property Item shell: shellLoader.status === Loader.Ready ? shellLoader.item : null
118118
119119 function init() {
120+ tryCompare(shell, "enabled", true); // will be enabled when greeter is all ready
120121 sessionSpy.target = findChild(shell, "greeter")
121122 swipeAwayGreeter()
122123 shell.failedLoginsDelayAttempts = -1
@@ -126,6 +127,8 @@ Row {
126127 }
127128
128129 function cleanup() {
130+ tryCompare(shell, "enabled", true); // make sure greeter didn't leave us in disabled state
131+
129132 shellLoader.itemDestroyed = false
130133
131134 shellLoader.active = false
tests/qmltests/tst_TabletShell.qml+3
@@ -118,12 +118,15 @@ Row {
118118 property Item shell: shellLoader.status === Loader.Ready ? shellLoader.item : null
119119
120120 function init() {
121+ tryCompare(shell, "enabled", true); // will be enabled when greeter is all ready
121122 sessionSpy.clear()
122123 sessionSpy.target = findChild(shell, "greeter")
123124 dashCommunicatorSpy.target = findInvisibleChild(shell, "dashCommunicator")
124125 }
125126
126127 function cleanup() {
128+ tryCompare(shell, "enabled", true); // make sure greeter didn't leave us in disabled state
129+
127130 shellLoader.itemDestroyed = false
128131
129132 shellLoader.active = false