git.iko.soy/unity8
on xenial help sign in
merge prereq
a81397dMichael Zanetti
tests/qmltests/tst_OrientedShell.qml+5−7
compare with xenial
unifiedsplit
@@ -522,8 +522,6 @@ Rectangle {
522 compare(shell.transformRotationAngle, root.primaryOrientationAngle);
522 compare(shell.transformRotationAngle, root.primaryOrientationAngle);
523 }
523 }
524
524
525−/* Flaky in adt and cannot reproduce locally. Given the deadline I won't risk this getting stuck in proposed.
526− Adding a skip() seems to fail this nevertheless for accessing a null object
527 function test_appSupportingOnlyPrimaryOrientationWillOnlyRotateInLandscape_data() {
525 function test_appSupportingOnlyPrimaryOrientationWillOnlyRotateInLandscape_data() {
528 return [
526 return [
529 {tag: "manta", deviceName: "manta"},
527 {tag: "manta", deviceName: "manta"},
@@ -544,25 +542,25 @@ Rectangle {
544 compare(dashApp.stage, ApplicationInfoInterface.MainStage);
542 compare(dashApp.stage, ApplicationInfoInterface.MainStage);
545
543
546 tryCompareFunction(function(){return dashApp.session.lastSurface != null;}, true);
544 tryCompareFunction(function(){return dashApp.session.lastSurface != null;}, true);
547− verify(checkAppSurfaceOrientation(dashAppWindow, dashApp, root.primaryOrientationAngle));
548
545
546+ tryCompareFunction(function(){return checkAppSurfaceOrientation(dashAppWindow, dashApp, root.primaryOrientationAngle)}, true);
549 compare(shell.transformRotationAngle, root.primaryOrientationAngle);
547 compare(shell.transformRotationAngle, root.primaryOrientationAngle);
548+
550 rotateTo(90);
549 rotateTo(90);
551
550
552− verify(checkAppSurfaceOrientation(dashAppWindow, dashApp, root.primaryOrientationAngle));
551+ tryCompareFunction(function(){return checkAppSurfaceOrientation(dashAppWindow, dashApp, root.primaryOrientationAngle)}, true);
553 compare(shell.transformRotationAngle, root.primaryOrientationAngle);
552 compare(shell.transformRotationAngle, root.primaryOrientationAngle);
554
553
555 rotateTo(180);
554 rotateTo(180);
556
555
557− verify(checkAppSurfaceOrientation(dashAppWindow, dashApp, root.primaryOrientationAngle + 180));
556+ tryCompareFunction(function(){return checkAppSurfaceOrientation(dashAppWindow, dashApp, root.primaryOrientationAngle + 180)}, true);
558 compare(shell.transformRotationAngle, root.primaryOrientationAngle + 180);
557 compare(shell.transformRotationAngle, root.primaryOrientationAngle + 180);
559
558
560 rotateTo(270);
559 rotateTo(270);
561
560
562− verify(checkAppSurfaceOrientation(dashAppWindow, dashApp, root.primaryOrientationAngle + 180));
561+ tryCompareFunction(function(){return checkAppSurfaceOrientation(dashAppWindow, dashApp, root.primaryOrientationAngle + 180)}, true);
563 compare(shell.transformRotationAngle, root.primaryOrientationAngle + 180);
562 compare(shell.transformRotationAngle, root.primaryOrientationAngle + 180);
564 }
563 }
565−*/
566
564
567 function test_greeterRemainsInPrimaryOrientation_data() {
565 function test_greeterRemainsInPrimaryOrientation_data() {
568 return [
566 return [