git.iko.soy/unity8
on xenial help sign in
fix testDesktopStage
commitf661fa46db6c45ef5569a913566ea248908ab475 authorMichael Zanetti <michael.zanetti@canonical.com> dateThu 30 Mar 2017, 14:09 (10 years ago) parent28d0c9b
2 files changed+4−4
compare with xenial
unifiedsplit
qml/Stage/ApplicationWindow.qml+4−2 tests/qmltests/Stage/tst_DesktopStage.qml−2
qml/Stage/ApplicationWindow.qml+4−2
@@ -53,7 +53,6 @@ FocusScope {
5353 print("AAA surface changed,", surface)
5454 if (surface) {
5555 surfaceContainer.surface = surface;
56− d.hadSurface = true;
5756 surfaceInitTimer.start();
5857 } else {
5958 d.surfaceInitialized = false;
@@ -117,7 +116,10 @@ FocusScope {
117116 id: surfaceInitTimer
118117 interval: 100
119118 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+ }
121123 }
122124 }
123125
tests/qmltests/Stage/tst_DesktopStage.qml−2
@@ -551,8 +551,6 @@ Item {
551551 var gmailDelegate = startApplication("gmail-webapp");
552552 verify(gmailDelegate);
553553
554− wait(2000)
555−
556554 var gmailMaximizeButton = findChild(gmailDelegate, "maximizeWindowButton");
557555 verify(gmailMaximizeButton);
558556 mouseClick(gmailMaximizeButton);