From 0828d4e8ea6d70ada3992445a02944ea03295613 Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Mon, 28 Dec 2015 15:16:40 -0200 Subject: [PATCH] Autotest: test both libdbus-1 load failure and connection failure Change-Id: I39cc61d0d59846ab8c23ffff14242294649c1a45 Reviewed-by: Lorn Potter --- tests/auto/dbus/dbus.pro | 1 + .../qdbusconnection_no_bus/tst_qdbusconnection_no_bus.cpp | 4 +++- .../qdbusconnection_no_libdbus.pro | 5 +++++ 3 files changed, 9 insertions(+), 1 deletion(-) create mode 100644 tests/auto/dbus/qdbusconnection_no_libdbus/qdbusconnection_no_libdbus.pro diff --git a/tests/auto/dbus/dbus.pro b/tests/auto/dbus/dbus.pro index ea8939bb9d..67cbc4bfef 100644 --- a/tests/auto/dbus/dbus.pro +++ b/tests/auto/dbus/dbus.pro @@ -10,6 +10,7 @@ SUBDIRS+=\ qdbusconnection \ qdbusconnection_no_app \ qdbusconnection_no_bus \ + qdbusconnection_no_libdbus \ qdbuscontext \ qdbusinterface \ qdbuslocalcalls \ 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) diff --git a/tests/auto/dbus/qdbusconnection_no_libdbus/qdbusconnection_no_libdbus.pro b/tests/auto/dbus/qdbusconnection_no_libdbus/qdbusconnection_no_libdbus.pro new file mode 100644 index 0000000000..cb0eab1a18 --- /dev/null +++ b/tests/auto/dbus/qdbusconnection_no_libdbus/qdbusconnection_no_libdbus.pro @@ -0,0 +1,5 @@ +CONFIG += testcase parallel_test +TARGET = tst_qdbusconnection_no_libdbus +QT = core dbus testlib +DEFINES += SIMULATE_LOAD_FAIL +SOURCES += ../qdbusconnection_no_bus/tst_qdbusconnection_no_bus.cpp