summaryrefslogtreecommitdiffstats
path: root/tests/auto/dbus
diff options
context:
space:
mode:
authorJason McDonald <jason.mcdonald@nokia.com>2011-10-19 12:53:13 +1000
committerQt by Nokia <qt-info@nokia.com>2011-10-21 01:20:29 +0200
commit27f9f136f7e39b5d612bc02f7ff8778ab424c07d (patch)
tree3c72358e3d1e42fbf0c386365e76db259e180bd7 /tests/auto/dbus
parent016cd01846539404a0eff1e3823fa2206fe2c9a9 (diff)
Remove SkipMode parameter from QSKIP calls.
The previous commit removed SkipMode from the testlib APi. This commit removes the parameter from all calls to QSKIP. Task-number: QTBUG-21851, QTBUG-21652 Change-Id: I21c0ee6731c1bc6ac6d962590d9b31d7459dfbc5 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Diffstat (limited to 'tests/auto/dbus')
-rw-r--r--tests/auto/dbus/qdbuslocalcalls/tst_qdbuslocalcalls.cpp2
-rw-r--r--tests/auto/dbus/qdbusmarshall/tst_qdbusmarshall.cpp4
2 files changed, 3 insertions, 3 deletions
diff --git a/tests/auto/dbus/qdbuslocalcalls/tst_qdbuslocalcalls.cpp b/tests/auto/dbus/qdbuslocalcalls/tst_qdbuslocalcalls.cpp
index c89fd7dde4..56431b8716 100644
--- a/tests/auto/dbus/qdbuslocalcalls/tst_qdbuslocalcalls.cpp
+++ b/tests/auto/dbus/qdbuslocalcalls/tst_qdbuslocalcalls.cpp
@@ -257,7 +257,7 @@ void tst_QDBusLocalCalls::asyncReplySignal()
callMsg << "Hello World";
QDBusPendingCall ac = conn.asyncCall(callMsg);
if (ac.isFinished())
- QSKIP("Test ignored: the local-loop async call is already finished", SkipAll);
+ QSKIP("Test ignored: the local-loop async call is already finished");
QDBusPendingCallWatcher watch(ac);
connect(&watch, SIGNAL(finished(QDBusPendingCallWatcher*)),
diff --git a/tests/auto/dbus/qdbusmarshall/tst_qdbusmarshall.cpp b/tests/auto/dbus/qdbusmarshall/tst_qdbusmarshall.cpp
index cca212e278..005dfda082 100644
--- a/tests/auto/dbus/qdbusmarshall/tst_qdbusmarshall.cpp
+++ b/tests/auto/dbus/qdbusmarshall/tst_qdbusmarshall.cpp
@@ -1060,7 +1060,7 @@ public:
void tst_QDBusMarshall::receiveUnknownType()
{
#ifndef DBUS_TYPE_UNIX_FD
- QSKIP("Your system's D-Bus library is too old for this test", SkipAll);
+ QSKIP("Your system's D-Bus library is too old for this test");
#else
QDBusConnection con = QDBusConnection::sessionBus();
QVERIFY(con.isConnected());
@@ -1074,7 +1074,7 @@ void tst_QDBusMarshall::receiveUnknownType()
// check if this bus supports passing file descriptors
if (!dbus_connection_can_send_type(rawcon.data(), DBUS_TYPE_UNIX_FD))
- QSKIP("Your session bus does not allow sending Unix file descriptors", SkipAll);
+ QSKIP("Your session bus does not allow sending Unix file descriptors");
// make sure this QDBusConnection won't handle Unix file descriptors
QDBusConnection::ConnectionCapabilities &capabRef = QDBusConnectionPrivate::d(con)->capabilities;