@@ -522,8 +522,6 @@ Rectangle {
522522 compare(shell.transformRotationAngle, root.primaryOrientationAngle);
523523 }
524524
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
527525 function test_appSupportingOnlyPrimaryOrientationWillOnlyRotateInLandscape_data() {
528526 return [
529527 {tag: "manta", deviceName: "manta"},
@@ -544,25 +542,25 @@ Rectangle {
544542 compare(dashApp.stage, ApplicationInfoInterface.MainStage);
545543
546544 tryCompareFunction(function(){return dashApp.session.lastSurface != null;}, true);
547− verify(checkAppSurfaceOrientation(dashAppWindow, dashApp, root.primaryOrientationAngle));
548545
546+ tryCompareFunction(function(){return checkAppSurfaceOrientation(dashAppWindow, dashApp, root.primaryOrientationAngle)}, true);
549547 compare(shell.transformRotationAngle, root.primaryOrientationAngle);
548+
550549 rotateTo(90);
551550
552− verify(checkAppSurfaceOrientation(dashAppWindow, dashApp, root.primaryOrientationAngle));
551+ tryCompareFunction(function(){return checkAppSurfaceOrientation(dashAppWindow, dashApp, root.primaryOrientationAngle)}, true);
553552 compare(shell.transformRotationAngle, root.primaryOrientationAngle);
554553
555554 rotateTo(180);
556555
557− verify(checkAppSurfaceOrientation(dashAppWindow, dashApp, root.primaryOrientationAngle + 180));
556+ tryCompareFunction(function(){return checkAppSurfaceOrientation(dashAppWindow, dashApp, root.primaryOrientationAngle + 180)}, true);
558557 compare(shell.transformRotationAngle, root.primaryOrientationAngle + 180);
559558
560559 rotateTo(270);
561560
562− verify(checkAppSurfaceOrientation(dashAppWindow, dashApp, root.primaryOrientationAngle + 180));
561+ tryCompareFunction(function(){return checkAppSurfaceOrientation(dashAppWindow, dashApp, root.primaryOrientationAngle + 180)}, true);
563562 compare(shell.transformRotationAngle, root.primaryOrientationAngle + 180);
564563 }
565−*/
566564
567565 function test_greeterRemainsInPrimaryOrientation_data() {
568566 return [