diff options
author | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2016-01-08 12:30:57 +0100 |
---|---|---|
committer | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2016-01-08 12:35:24 +0100 |
commit | ad16478a76815f8f61d454bf7760aaf9ffbb4b51 (patch) | |
tree | eefdd9219cc9d59b62e042f49fc7555b980cb7a4 /tests/auto/dbus/qdbusconnection_no_bus | |
parent | 80a741f3616290897ba0d9f1cbd3c9c5ee62da37 (diff) | |
parent | 09c92863001790a0304a5ef389901ee2b5b6cdc2 (diff) |
Merge remote-tracking branch 'origin/5.6' into dev
Based on merge done by Liang Qi
Change-Id: Id566e5b9f284d29bff2199f13f9417c660f5b26f
Diffstat (limited to 'tests/auto/dbus/qdbusconnection_no_bus')
-rw-r--r-- | tests/auto/dbus/qdbusconnection_no_bus/qdbusconnection_no_bus.pro | 2 | ||||
-rw-r--r-- | tests/auto/dbus/qdbusconnection_no_bus/tst_qdbusconnection_no_bus.cpp | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/tests/auto/dbus/qdbusconnection_no_bus/qdbusconnection_no_bus.pro b/tests/auto/dbus/qdbusconnection_no_bus/qdbusconnection_no_bus.pro index 97d3c0ebf4..1998cc6df7 100644 --- a/tests/auto/dbus/qdbusconnection_no_bus/qdbusconnection_no_bus.pro +++ b/tests/auto/dbus/qdbusconnection_no_bus/qdbusconnection_no_bus.pro @@ -1,4 +1,4 @@ -CONFIG += testcase +CONFIG += testcase parallel_test TARGET = tst_qdbusconnection_no_bus QT = core dbus testlib SOURCES += tst_qdbusconnection_no_bus.cpp diff --git a/tests/auto/dbus/qdbusconnection_no_bus/tst_qdbusconnection_no_bus.cpp b/tests/auto/dbus/qdbusconnection_no_bus/tst_qdbusconnection_no_bus.cpp index 21f8f11f80..5a74096059 100644 --- a/tests/auto/dbus/qdbusconnection_no_bus/tst_qdbusconnection_no_bus.cpp +++ b/tests/auto/dbus/qdbusconnection_no_bus/tst_qdbusconnection_no_bus.cpp @@ -52,7 +52,9 @@ public: tst_QDBusConnectionNoBus() { qputenv("DBUS_SESSION_BUS_ADDRESS", "unix:abstract=/tmp/does_not_exist"); +#ifdef SIMULATE_LOAD_FAIL qputenv("QT_SIMULATE_DBUS_LIBFAIL", "1"); +#endif } private slots: @@ -67,7 +69,7 @@ void tst_QDBusConnectionNoBus::connectToBus() QDBusConnection con = QDBusConnection::sessionBus(); - QVERIFY(true); // if we didn't crash here, the test passed :) + QVERIFY(!con.isConnected()); // if we didn't crash here, the test passed :) } QTEST_APPLESS_MAIN(tst_QDBusConnectionNoBus) |