git.iko.soy/unity8
on xenial help sign in
Fix panel test by making verifying synchronous
8a0b6f5Marius Gripsgard
tests/qmltests/Tutorial/tst_Tutorial.qml+2−4
compare with xenial
unifiedsplit
@@ -586,8 +586,6 @@ Rectangle {
586 }
586 }
587
587
588 function test_tutorialRightShortDrag() {
588 function test_tutorialRightShortDrag() {
589− skip("This test interferes with test_tutorialRightAutoSkipped. If" +
590− " one runs before the other, the second one will fail. FIXME");
591 var tutorial = findChild(shell, "tutorial");
589 var tutorial = findChild(shell, "tutorial");
592 var tutorialRight = findChild(tutorial, "tutorialRight");
590 var tutorialRight = findChild(tutorial, "tutorialRight");
593 var stage = findChild(shell, "stage");
591 var stage = findChild(shell, "stage");
@@ -596,9 +594,9 @@ Rectangle {
596 touchFlick(shell, shell.width, halfHeight, shell.width * 0.8, halfHeight, true, false);
594 touchFlick(shell, shell.width, halfHeight, shell.width * 0.8, halfHeight, true, false);
597 // compare opacity with a bound rather than hard 0.6 because progress doesn't
595 // compare opacity with a bound rather than hard 0.6 because progress doesn't
598 // always match the drag perfectly (takes a moment for drag to kick in)
596 // always match the drag perfectly (takes a moment for drag to kick in)
599− tryCompareFunction(function() {
597+ verify(function() {
600 return tutorialRight.opacity >= 0.6 && tutorialRight.opacity < 0.8;
598 return tutorialRight.opacity >= 0.6 && tutorialRight.opacity < 0.8;
601− }, true);
599+ });
602 touchFlick(shell, shell.width, halfHeight, shell.width * 0.8, halfHeight, false, true);
600 touchFlick(shell, shell.width, halfHeight, shell.width * 0.8, halfHeight, false, true);
603
601
604 compare(tutorialRight.shown, true);
602 compare(tutorialRight.shown, true);