aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJason McDonald <jason.mcdonald@nokia.com>2012-01-17 16:12:02 +1000
committerQt by Nokia <qt-info@nokia.com>2012-01-19 06:28:12 +0100
commitf52cd2cbe2760cc32858628b7d9bba0ffc12e6ba (patch)
tree78ef2b162bcb8608fc38856ef967753d5d2bae0f
parentf9852d168e6ae1c651304863e2aac532b0ac5e2a (diff)
Change testlib skipAll function to failure.
Be more insistent that tests using the obsolete skipAll() function should change to using skip() by treating calls to skipAll() as test failures. After a further grace period the skipAll() function will be removed. Change-Id: Ic2448af2f8176909afa151b6e8c29587dfd17f1f Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
-rw-r--r--src/imports/testlib/TestCase.qml8
1 files changed, 3 insertions, 5 deletions
diff --git a/src/imports/testlib/TestCase.qml b/src/imports/testlib/TestCase.qml
index 0e49365c5f..182c52755d 100644
--- a/src/imports/testlib/TestCase.qml
+++ b/src/imports/testlib/TestCase.qml
@@ -313,10 +313,8 @@ Item {
}
function skipAll(msg) {
- if (msg === undefined)
- msg = ""
- warn("The skipAll function is deprecated and will be removed soon. Please update this test by changing skipAll to skip.")
- qtest_results.skip(msg, util.callerFile(), util.callerLine())
+ msg = "The skipAll function is no longer available. Please update this test by changing skipAll to skip."
+ qtest_results.fail(msg, util.callerFile(), util.callerLine())
throw new Error("QtQuickTest::skip")
}
@@ -716,4 +714,4 @@ Item {
if (when && !completed && !running)
qtest_run()
}
-} \ No newline at end of file
+}