diff options
author | Martin Wolf <ext-martin.2.wolf@nokia.com> | 2010-03-19 12:28:23 +0200 |
---|---|---|
committer | Martin Wolf <ext-martin.2.wolf@nokia.com> | 2010-03-19 12:28:23 +0200 |
commit | 6eff9f8263541053b66d10960e909707ed592f62 (patch) | |
tree | 23eda984bedec18f8a645e4f43bda52dcfa8488d /tests | |
parent | 67649bb4c02c471ac394d490851c7c3ae5126c41 (diff) |
Updated DBus configuration for tests, moved header file for dbus-qeventloop to proper include dir, repaired small bug in pong server for tests, renamed tests for dbus-qeventloop
Diffstat (limited to 'tests')
-rw-r--r-- | tests/test-dbus-pong/test-dbus-pong.cpp | 2 | ||||
-rw-r--r-- | tests/test-dbus-qeventloop.conf | 14 | ||||
-rw-r--r-- | tests/tests.pro | 4 | ||||
-rw-r--r-- | tests/tests.xml | 2 |
4 files changed, 19 insertions, 3 deletions
diff --git a/tests/test-dbus-pong/test-dbus-pong.cpp b/tests/test-dbus-pong/test-dbus-pong.cpp index fa4f71c..bdd610a 100644 --- a/tests/test-dbus-pong/test-dbus-pong.cpp +++ b/tests/test-dbus-pong/test-dbus-pong.cpp @@ -42,7 +42,7 @@ int main(int argc, char **argv) QDBusConnection* myBus; if (useSessionBus) { - myBus = new QDBusConnection(QDBusConnection::systemBus().sessionBus()); + myBus = new QDBusConnection(QDBusConnection::sessionBus().sessionBus()); qDebug("Using session bus ..."); } else { diff --git a/tests/test-dbus-qeventloop.conf b/tests/test-dbus-qeventloop.conf new file mode 100644 index 0000000..bd231a3 --- /dev/null +++ b/tests/test-dbus-qeventloop.conf @@ -0,0 +1,14 @@ +<!DOCTYPE busconfig PUBLIC "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN" + "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd"> +<busconfig> + <policy user="root"> + <allow own="com.nokia.dbusqeventloop.test"/> + <allow send_destination="com.nokia.dbusqeventloop.test"/> + <allow receive_sender="com.nokia.dbusqeventloop.test"/> + </policy> + <policy context="default"> + <allow own="com.nokia.dbusqeventloop.test"/> + <allow send_destination="com.nokia.dbusqeventloop.test"/> + <allow receive_sender="com.nokia.dbusqeventloop.test"/> + </policy> +</busconfig> diff --git a/tests/tests.pro b/tests/tests.pro index 0c969df..3d0658c 100644 --- a/tests/tests.pro +++ b/tests/tests.pro @@ -16,4 +16,6 @@ testsxml.path = /usr/share/libresourceqt-tests/ testsxml.files = tests.xml testrunner.path = /usr/lib/libresourceqt-tests/ testrunner.files = test-dbus-qeventloop-runner.sh -INSTALLS = testsxml testrunner +dbusconf.path = /etc/dbus-1/system.d/ +dbusconf.files = test-dbus-qeventloop.conf +INSTALLS = testsxml testrunner dbusconf diff --git a/tests/tests.xml b/tests/tests.xml index 5175902..f73b9da 100644 --- a/tests/tests.xml +++ b/tests/tests.xml @@ -26,7 +26,7 @@ <suite name="libdbus-qeventloop-tests" domain="Multimedia Middleware"> <set name="libdbus-qeventloop-tests" feature="Resource policy"> - <case name="unit-tests" type="Functional" level="Component" subfeature="libresource Qt API" description="Unit tests for libdbus-qeventloop" timeout="15"> + <case name="DBusQEventLoop functional test" type="Functional" level="Component" subfeature="libresource Qt API" description="Functional tests for libdbus-qeventloop" timeout="25"> <step expected_result="0">/usr/lib/libresourceqt-tests/test-dbus-qeventloop-runner.sh</step> </case> |