@@ -516,8 +516,6 @@ Rectangle {
516516 compare(shell.transformRotationAngle, root.primaryOrientationAngle);
517517 }
518518
519−/* Flaky in adt and cannot reproduce locally. Given the deadline I won't risk this getting stuck in proposed.
520− Adding a skip() seems to fail this nevertheless for accessing a null object
521519 function test_appSupportingOnlyPrimaryOrientationWillOnlyRotateInLandscape_data() {
522520 return [
523521 {tag: "manta", deviceName: "manta"},
@@ -538,25 +536,25 @@ Rectangle {
538536 compare(dashApp.stage, ApplicationInfoInterface.MainStage);
539537
540538 tryCompareFunction(function(){return dashApp.session.lastSurface != null;}, true);
541− verify(checkAppSurfaceOrientation(dashAppWindow, dashApp, root.primaryOrientationAngle));
542539
540+ tryCompareFunction(function(){return checkAppSurfaceOrientation(dashAppWindow, dashApp, root.primaryOrientationAngle)}, true);
543541 compare(shell.transformRotationAngle, root.primaryOrientationAngle);
542+
544543 rotateTo(90);
545544
546− verify(checkAppSurfaceOrientation(dashAppWindow, dashApp, root.primaryOrientationAngle));
545+ tryCompareFunction(function(){return checkAppSurfaceOrientation(dashAppWindow, dashApp, root.primaryOrientationAngle)}, true);
547546 compare(shell.transformRotationAngle, root.primaryOrientationAngle);
548547
549548 rotateTo(180);
550549
551− verify(checkAppSurfaceOrientation(dashAppWindow, dashApp, root.primaryOrientationAngle + 180));
550+ tryCompareFunction(function(){return checkAppSurfaceOrientation(dashAppWindow, dashApp, root.primaryOrientationAngle + 180)}, true);
552551 compare(shell.transformRotationAngle, root.primaryOrientationAngle + 180);
553552
554553 rotateTo(270);
555554
556− verify(checkAppSurfaceOrientation(dashAppWindow, dashApp, root.primaryOrientationAngle + 180));
555+ tryCompareFunction(function(){return checkAppSurfaceOrientation(dashAppWindow, dashApp, root.primaryOrientationAngle + 180)}, true);
557556 compare(shell.transformRotationAngle, root.primaryOrientationAngle + 180);
558557 }
559−*/
560558
561559 function test_greeterRemainsInPrimaryOrientation_data() {
562560 return [