Merge ~osomon/oxide:fix-zoomfactor-unit-tests into oxide:master

[Olivier Tilloy]

Make zoom factor unit tests more robust.

diff --git a/qt/tests/qmltests/api/tst_WebView_zoomFactor.qml b/qt/tests/qmltests/api/tst_WebView_zoomFactor.qml
index d4479df..3126331 100644
--- a/qt/tests/qmltests/api/tst_WebView_zoomFactor.qml
+++ b/qt/tests/qmltests/api/tst_WebView_zoomFactor.qml
@@ -32,12 +32,18 @@ TestWebView {
 
     function verify_zoomFactor(factor) {
       compare(webView.zoomFactor, factor);
+      function testpixel(i, color) {
+        var image = grabImage(webView);
+        return (image.pixel(i, i) == color);
+      }
+      var zoomedSize = Math.round(originalSize * factor);
+      verify(TestUtils.waitFor(function() { return testpixel(zoomedSize - 1, red); }));
+      verify(TestUtils.waitFor(function() { return testpixel(zoomedSize, white); }));
       var image = grabImage(webView);
-      var zoomedSize = originalSize * factor;
       for (var i = 0; i < zoomedSize; ++i) {
         compare(image.pixel(i, i), red);
       }
-      compare(image.pixel(zoomedSize + 1, zoomedSize + 1), white);
+      compare(image.pixel(zoomedSize, zoomedSize), white);
     }
 
     function test_WebView_zoomFactor() {