git.iko.soy/unity8
on xenial help sign in
Add wait(500) to properly test leftEdgeDrag
commit95d540340e770bc7865b81010fb421b59430e413 authorMichael Terry <michael.terry@canonical.com> dateWed 8 Oct 2014, 16:36 (12 years ago) parentfec14c1
2 files changed+5−3
compare with xenial
unifiedsplit
qml/Shell.qml+1 tests/qmltests/tst_TabletShell.qml+4−3
qml/Shell.qml+1
@@ -444,6 +444,7 @@ Item {
444444 Item {
445445 // Just a tiny wrapper to adjust greeter's x without messing with its own dragging
446446 id: greeterWrapper
447+ objectName: "greeterWrapper"
447448 x: greeter.narrowMode ? launcher.progress : 0
448449 y: panel.panelHeight
449450 width: parent.width
tests/qmltests/tst_TabletShell.qml+4−3
@@ -112,7 +112,7 @@ Row {
112112
113113 UT.UnityTestCase {
114114 id: testCase
115− name: "Shell"
115+ name: "TabletShell"
116116 when: windowShown
117117
118118 property Item shell: shellLoader.status === Loader.Ready ? shellLoader.item : null
@@ -204,8 +204,8 @@ Row {
204204 }
205205
206206 function confirmLoggedIn(loggedIn) {
207− var greeter = findChild(shell, "greeter")
208− tryCompare(greeter, "showProgress", loggedIn ? 0 : 1)
207+ var greeterWrapper = findChild(shell, "greeterWrapper")
208+ tryCompare(greeterWrapper, "showProgress", loggedIn ? 0 : 1)
209209 tryCompare(sessionSpy, "count", loggedIn ? 1 : 0)
210210 }
211211
@@ -282,6 +282,7 @@ Row {
282282 function test_leftEdgeDrag(data) {
283283 selectUser(data.user)
284284 swipeFromLeftEdge(shell.width * 0.75)
285+ wait(500) // to give time to handle dash() signal from Launcher
285286 confirmLoggedIn(data.loggedIn)
286287 }
287288 }