git.iko.soy/unity8
on xenial help sign in
Make ShellWithPin tests more reliable
a49705dMichael Terry
tests/qmltests/tst_Shell.qml+1
compare with xenial
unifiedsplit
@@ -401,6 +401,7 @@ Item {
401 tryCompare(greeter, "showProgress", 0)
401 tryCompare(greeter, "showProgress", 0)
402 waitForRendering(greeter);
402 waitForRendering(greeter);
403 LightDM.Greeter.showGreeter()
403 LightDM.Greeter.showGreeter()
404+ waitForRendering(greeter)
404 tryCompare(greeter, "showProgress", 1)
405 tryCompare(greeter, "showProgress", 1)
405 LightDM.Greeter.hideGreeter()
406 LightDM.Greeter.hideGreeter()
406 tryCompare(greeter, "showProgress", 0)
407 tryCompare(greeter, "showProgress", 0)
tests/qmltests/tst_ShellWithPin.qml+70−24
@@ -27,10 +27,9 @@ import Powerd 0.1
27
27
28import "../../qml"
28import "../../qml"
29
29
30−Item {
30+Row {
31 id: root
31 id: root
32− width: shell.width + units.gu(20)
32+ spacing: 0
33− height: shell.height
34
33
35 QtObject {
34 QtObject {
36 id: applicationArguments
35 id: applicationArguments
@@ -48,21 +47,55 @@ Item {
48 }
47 }
49 }
48 }
50
49
51− Shell {
50+ Loader {
52− id: shell
51+ id: shellLoader
53− maxFailedLogins: maxRetriesTextField.text
52+
54− }
55− Column {
56− anchors { top: parent.top; right: parent.right; bottom: parent.bottom; margins:units.gu(1) }
57− width: units.gu(18)
53+ width: units.gu(40)
54+ height: units.gu(71)
58
55
59− Label {
56+ property bool itemDestroyed: false
60− text: "Max retries:"
57+ sourceComponent: Component {
61− color: "black"
58+ Shell {
59+ Component.onDestruction: {
60+ shellLoader.itemDestroyed = true
61+ }
62+ maxFailedLogins: maxRetriesTextField.text
63+ }
62 }
64 }
65+ }
66+
67+ Rectangle {
68+ color: "white"
69+ width: units.gu(30)
70+ height: shellLoader.height
71+
72+ Column {
73+ anchors { left: parent.left; right: parent.right; top: parent.top; margins: units.gu(1) }
74+ spacing: units.gu(1)
75+ Row {
76+ anchors { left: parent.left; right: parent.right }
77+ Button {
78+ text: "Show Greeter"
79+ onClicked: {
80+ if (shellLoader.status !== Loader.Ready)
81+ return
82+
83+ var greeter = testCase.findChild(shellLoader.item, "greeter")
84+ if (!greeter.shown) {
85+ greeter.show()
86+ }
87+ }
88+ }
89+ }
90+
91+ Label {
92+ text: "Max retries:"
93+ color: "black"
94+ }
63− TextField {
95+ TextField {
64− id: maxRetriesTextField
96+ id: maxRetriesTextField
65− text: "-1"
97+ text: "-1"
98+ }
66 }
99 }
67 }
100 }
68
101
@@ -81,13 +114,10 @@ Item {
81 name: "ShellWithPin"
114 name: "ShellWithPin"
82 when: windowShown
115 when: windowShown
83
116
84− function initTestCase() {
117+ property Item shell: shellLoader.status === Loader.Ready ? shellLoader.item : null
85−
86− sessionSpy.target = findChild(shell, "greeter")
87− }
88
118
89 function init() {
119 function init() {
90− shell.tablet = false
120+ sessionSpy.target = findChild(shell, "greeter")
91 swipeAwayGreeter()
121 swipeAwayGreeter()
92 shell.failedLoginsDelayAttempts = -1
122 shell.failedLoginsDelayAttempts = -1
93 maxRetriesTextField.text = "-1"
123 maxRetriesTextField.text = "-1"
@@ -96,12 +126,28 @@ Item {
96 }
126 }
97
127
98 function cleanup() {
128 function cleanup() {
99− LightDM.Greeter.showGreeter()
129+ shellLoader.itemDestroyed = false
100− var greeter = findChild(shell, "greeter")
130+
101− tryCompare(greeter, "showProgress", 1)
131+ shellLoader.active = false
132+
133+ tryCompare(shellLoader, "status", Loader.Null)
134+ tryCompare(shellLoader, "item", null)
135+ // Loader.status might be Loader.Null and Loader.item might be null but the Loader
136+ // item might still be alive. So if we set Loader.active back to true
137+ // again right now we will get the very same Shell instance back. So no reload
138+ // actually took place. Likely because Loader waits until the next event loop
139+ // iteration to do its work. So to ensure the reload, we will wait until the
140+ // Shell instance gets destroyed.
141+ tryCompare(shellLoader, "itemDestroyed", true)
102
142
103 // kill all (fake) running apps
143 // kill all (fake) running apps
104 killApps()
144 killApps()
145+
146+ // reload our test subject to get it in a fresh state once again
147+ shellLoader.active = true
148+
149+ tryCompare(shellLoader, "status", Loader.Ready)
150+ removeTimeConstraintsFromDirectionalDragAreas(shellLoader.item)
105 }
151 }
106
152
107 function killApps() {
153 function killApps() {
tests/qmltests/tst_TabletShell.qml+1−1
@@ -139,7 +139,7 @@ Row {
139 tryCompare(shellLoader, "itemDestroyed", true)
139 tryCompare(shellLoader, "itemDestroyed", true)
140
140
141 // kill all (fake) running apps
141 // kill all (fake) running apps
142− killApps(ApplicationManager)
142+ killApps()
143
143
144 unlockAllModemsSpy.clear()
144 unlockAllModemsSpy.clear()
145
145