git.iko.soy/unity8
on xenial help sign in
see if this helps with CI
431096eMichael Zanetti
tests/qmltests/Stage/tst_TabletStage.qml+3−6
compare with xenial
unifiedsplit
@@ -586,21 +586,17 @@ Rectangle {
586 webbrowserCheckBox.checked = true;
586 webbrowserCheckBox.checked = true;
587 waitUntilAppSurfaceShowsUp(webbrowserSurfaceId);
587 waitUntilAppSurfaceShowsUp(webbrowserSurfaceId);
588
588
589− print("browser should be focused now")
590− return;
591− wait(10000)
592 var appDelegate = findChild(stage, "appDelegate_" + webbrowserSurfaceId);
589 var appDelegate = findChild(stage, "appDelegate_" + webbrowserSurfaceId);
593 verify(appDelegate);
590 verify(appDelegate);
591+ waitForRendering(stage);
594 compare(appDelegate.stage, ApplicationInfoInterface.MainStage);
592 compare(appDelegate.stage, ApplicationInfoInterface.MainStage);
595
593
596 dragToSideStage(webbrowserSurfaceId);
594 dragToSideStage(webbrowserSurfaceId);
597
595
598− var spreadView = findChild(stageLoader, "spreadView")
599− tryCompare(spreadView, "surfaceDragging", false);
600 tryCompare(appDelegate, "stage", ApplicationInfoInterface.SideStage);
596 tryCompare(appDelegate, "stage", ApplicationInfoInterface.SideStage);
601 }
597 }
602
598
603− function test_unloadSideStageByDraggingFromStageStage() {
599+ function test_unloadSideStageByDraggingFromSideStage() {
604 sideStage.showNow();
600 sideStage.showNow();
605 WindowStateStorage.saveStage(webbrowserCheckBox.appId, ApplicationInfoInterface.SideStage)
601 WindowStateStorage.saveStage(webbrowserCheckBox.appId, ApplicationInfoInterface.SideStage)
606 var webbrowserSurfaceId = topSurfaceList.nextId;
602 var webbrowserSurfaceId = topSurfaceList.nextId;
@@ -609,6 +605,7 @@ Rectangle {
609
605
610 var appDelegate = findChild(stage, "appDelegate_" + webbrowserSurfaceId);
606 var appDelegate = findChild(stage, "appDelegate_" + webbrowserSurfaceId);
611 verify(appDelegate);
607 verify(appDelegate);
608+ waitForRendering(stage);
612 compare(appDelegate.stage, ApplicationInfoInterface.SideStage);
609 compare(appDelegate.stage, ApplicationInfoInterface.SideStage);
613
610
614 dragToMainStage(webbrowserSurfaceId);
611 dragToMainStage(webbrowserSurfaceId);