git.iko.soy/unity8
on xenial help sign in
Try to guard against the shell.enabled logic from biting us
c5998b1Michael Terry
tests/qmltests/tst_Shell.qml+4
compare with xenial
unifiedsplit
@@ -127,6 +127,8 @@ Row {
127 property Item shell: shellLoader.status === Loader.Ready ? shellLoader.item : null
127 property Item shell: shellLoader.status === Loader.Ready ? shellLoader.item : null
128
128
129 function init() {
129 function init() {
130+ tryCompare(shell, "enabled", true); // enabled by greeter when ready
131+
130 swipeAwayGreeter();
132 swipeAwayGreeter();
131
133
132 sessionSpy.target = findChild(shell, "greeter")
134 sessionSpy.target = findChild(shell, "greeter")
@@ -134,6 +136,8 @@ Row {
134 }
136 }
135
137
136 function cleanup() {
138 function cleanup() {
139+ tryCompare(shell, "enabled", true); // make sure greeter didn't leave us in disabled state
140+
137 shellLoader.itemDestroyed = false;
141 shellLoader.itemDestroyed = false;
138
142
139 shellLoader.active = false;
143 shellLoader.active = false;
tests/qmltests/tst_ShellWithPin.qml+3
@@ -117,6 +117,7 @@ Row {
117 property Item shell: shellLoader.status === Loader.Ready ? shellLoader.item : null
117 property Item shell: shellLoader.status === Loader.Ready ? shellLoader.item : null
118
118
119 function init() {
119 function init() {
120+ tryCompare(shell, "enabled", true); // will be enabled when greeter is all ready
120 sessionSpy.target = findChild(shell, "greeter")
121 sessionSpy.target = findChild(shell, "greeter")
121 swipeAwayGreeter()
122 swipeAwayGreeter()
122 shell.failedLoginsDelayAttempts = -1
123 shell.failedLoginsDelayAttempts = -1
@@ -126,6 +127,8 @@ Row {
126 }
127 }
127
128
128 function cleanup() {
129 function cleanup() {
130+ tryCompare(shell, "enabled", true); // make sure greeter didn't leave us in disabled state
131+
129 shellLoader.itemDestroyed = false
132 shellLoader.itemDestroyed = false
130
133
131 shellLoader.active = false
134 shellLoader.active = false
tests/qmltests/tst_TabletShell.qml+3
@@ -118,12 +118,15 @@ Row {
118 property Item shell: shellLoader.status === Loader.Ready ? shellLoader.item : null
118 property Item shell: shellLoader.status === Loader.Ready ? shellLoader.item : null
119
119
120 function init() {
120 function init() {
121+ tryCompare(shell, "enabled", true); // will be enabled when greeter is all ready
121 sessionSpy.clear()
122 sessionSpy.clear()
122 sessionSpy.target = findChild(shell, "greeter")
123 sessionSpy.target = findChild(shell, "greeter")
123 dashCommunicatorSpy.target = findInvisibleChild(shell, "dashCommunicator")
124 dashCommunicatorSpy.target = findInvisibleChild(shell, "dashCommunicator")
124 }
125 }
125
126
126 function cleanup() {
127 function cleanup() {
128+ tryCompare(shell, "enabled", true); // make sure greeter didn't leave us in disabled state
129+
127 shellLoader.itemDestroyed = false
130 shellLoader.itemDestroyed = false
128
131
129 shellLoader.active = false
132 shellLoader.active = false