aboutsummaryrefslogtreecommitdiffstats
path: root/tests/auto/quick/qquickcanvasitem
diff options
context:
space:
mode:
authorCharles Yin <yinyunqiao@gmail.com>2012-06-04 23:03:58 +1000
committerQt by Nokia <qt-info@nokia.com>2012-06-05 02:00:30 +0200
commit1346c668cb65a8906cf31fc7e5a3a5f817f15af6 (patch)
tree6363afde1a61a940de0b19ce8dc4d9103d2fd2f6 /tests/auto/quick/qquickcanvasitem
parent41a9f34461e34c171ce7ecc4b3e9bc64948ffbde (diff)
Fix unstable test_paint test case
Change-Id: I11c79b3f014d82b113429bd17b2d5473fdcebf1d Task-number: QTBUG-25859 Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
Diffstat (limited to 'tests/auto/quick/qquickcanvasitem')
-rw-r--r--tests/auto/quick/qquickcanvasitem/data/tst_canvas.qml7
-rw-r--r--tests/auto/quick/qquickcanvasitem/qquickcanvasitem.pro1
2 files changed, 5 insertions, 3 deletions
diff --git a/tests/auto/quick/qquickcanvasitem/data/tst_canvas.qml b/tests/auto/quick/qquickcanvasitem/data/tst_canvas.qml
index 683d4522aa..f13039ad95 100644
--- a/tests/auto/quick/qquickcanvasitem/data/tst_canvas.qml
+++ b/tests/auto/quick/qquickcanvasitem/data/tst_canvas.qml
@@ -178,7 +178,9 @@ CanvasTestCase {
verify(c);
var ctx = c.getContext("2d");
tryCompare(c, "availableChangedCount", 1);
-
+ //scene graph could be available immediately
+ //in this case, we force waiting a short while until the init paint finished
+ tryCompare(c, "paintedCount", 1);
ctx.fillRect(0, 0, c.width, c.height);
c.toDataURL();
tryCompare(c, "paintedCount", 2);
@@ -228,4 +230,5 @@ CanvasTestCase {
c.destroy();
}
-} \ No newline at end of file
+}
+
diff --git a/tests/auto/quick/qquickcanvasitem/qquickcanvasitem.pro b/tests/auto/quick/qquickcanvasitem/qquickcanvasitem.pro
index f109d37809..e2a51d2df7 100644
--- a/tests/auto/quick/qquickcanvasitem/qquickcanvasitem.pro
+++ b/tests/auto/quick/qquickcanvasitem/qquickcanvasitem.pro
@@ -3,7 +3,6 @@ TEMPLATE=app
TARGET=tst_qquickcanvasitem
CONFIG += warn_on qmltestcase
-CONFIG += insignificant_test #QTBUG-25859
SOURCES += tst_qquickcanvasitem.cpp
TESTDATA = data/*