git.iko.soy/unity8
on xenial help sign in
fix testDesktopStage
f661fa4Michael Zanetti
qml/Stage/ApplicationWindow.qml+4−2
compare with xenial
unifiedsplit
@@ -53,7 +53,6 @@ FocusScope {
53 print("AAA surface changed,", surface)
53 print("AAA surface changed,", surface)
54 if (surface) {
54 if (surface) {
55 surfaceContainer.surface = surface;
55 surfaceContainer.surface = surface;
56− d.hadSurface = true;
57 surfaceInitTimer.start();
56 surfaceInitTimer.start();
58 } else {
57 } else {
59 d.surfaceInitialized = false;
58 d.surfaceInitialized = false;
@@ -117,7 +116,10 @@ FocusScope {
117 id: surfaceInitTimer
116 id: surfaceInitTimer
118 interval: 100
117 interval: 100
119 onTriggered: {
118 onTriggered: {
120− if (root.surface && root.surface.live) {d.surfaceInitialized = true;}
119+ if (root.surface && root.surface.live) {
120+ d.surfaceInitialized = true;
121+ d.hadSurface = true;
122+ }
121 }
123 }
122 }
124 }
123
125
tests/qmltests/Stage/tst_DesktopStage.qml−2
@@ -551,8 +551,6 @@ Item {
551 var gmailDelegate = startApplication("gmail-webapp");
551 var gmailDelegate = startApplication("gmail-webapp");
552 verify(gmailDelegate);
552 verify(gmailDelegate);
553
553
554− wait(2000)
555−
556 var gmailMaximizeButton = findChild(gmailDelegate, "maximizeWindowButton");
554 var gmailMaximizeButton = findChild(gmailDelegate, "maximizeWindowButton");
557 verify(gmailMaximizeButton);
555 verify(gmailMaximizeButton);
558 mouseClick(gmailMaximizeButton);
556 mouseClick(gmailMaximizeButton);