Merge lp:~aacid/unity8/waitForRenderingNoCrash into lp:unity8

[Albert Astals Cid]

Make waitForRendering with no item fail instead of crash

 * Are there any related MPs required for this MP to build/function as expected?
No

 * Did you perform an exploratory manual test run of your code change and any related functionality?
No, it's just a test change

 * Did you make sure that your branch does not contain spurious tags?
Yes

 * If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?
N/A

 * If you changed the UI, has there been a design review?
N/A

[lp:~aacid/unity8/waitForRenderingNoCrash]

1525. By Albert Astals Cid on 2015-01-07

Add ;

[Michał Sawicz (saviq)]

 * Did you perform an exploratory manual test run of the code change and any related functionality?
Just tests, will make sure that CI does its job.

 * Did CI run pass? If not, please explain why.
Waiting.

 * Did you make sure that the branch does not contain spurious tags?
Y

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1525
http://jenkins.qa.ubuntu.com/job/unity8-ci/5094/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/695
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/258
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/259
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/259
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/599
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/693
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/693/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/16881

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/5094/rebuild

review: Approve (continuous-integration)

[lp:~aacid/unity8/waitForRenderingNoCrash]

1526. By Albert Astals Cid on 2015-01-09

Add note we can remove it once we switch to Qt 5.5

=== modified file 'tests/utils/modules/Unity/Test/UnityTestCase.qml'
--- tests/utils/modules/Unity/Test/UnityTestCase.qml	2014-11-24 11:17:33 +0000
+++ tests/utils/modules/Unity/Test/UnityTestCase.qml	2015-01-09 08:47:16 +0000
@@ -381,4 +381,14 @@
             }
         }
     }
+
+    // TODO This function can be removed altogether once we use Qt 5.5 which has the same feature
+    function waitForRendering(item, timeout) {
+        if (timeout === undefined)
+            timeout = 5000;
+        if (!item)
+            qtest_fail("No item given to waitForRendering", 1);
+        return qtest_results.waitForRendering(item, timeout);
+    }
+
 }