aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog4
-rw-r--r--debian/rules4
-rw-r--r--debian/tests/control2
-rw-r--r--debian/tests/start-service11
4 files changed, 19 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog
index 14c76e9..882d64a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -34,6 +34,10 @@ indicator-session (12.10.5-0ubuntu1) UNRELEASED; urgency=low
* debian/control:
- clean deprecated Build-Depends on gconf and dbusglib
+ [ Didier Roche ]
+ * run tests not under fakeroot for dbus tests (which don't seem to be able to
+ run easily under dbus-test-runner)
+
-- Sebastien Bacher <seb128@ubuntu.com> Fri, 30 Nov 2012 11:11:49 +0100
indicator-session (12.10.4-0ubuntu1) quantal; urgency=low
diff --git a/debian/rules b/debian/rules
index 54cfd06..f679369 100644
--- a/debian/rules
+++ b/debian/rules
@@ -15,3 +15,7 @@ override_dh_install:
override_dh_auto_configure:
dh_auto_configure -- --libexecdir="\$${prefix}/lib/indicator-session"
+
+# Hack as it seems it's not possible to easy run that under dbus-test-runner
+override_dh_auto_test:
+ env -u LD_PRELOAD dh_auto_test
diff --git a/debian/tests/control b/debian/tests/control
index c1ccd70..e24f71b 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -1,3 +1,3 @@
Tests: start-service
-Depends: dbus-test-runner, indicator-session
+Depends: python3-aptdaemon.test, accountsservice, consolekit, indicator-session
Restrictions: build-needed
diff --git a/debian/tests/start-service b/debian/tests/start-service
index c1d59c2..1aeef94 100644
--- a/debian/tests/start-service
+++ b/debian/tests/start-service
@@ -1,3 +1,12 @@
#!/bin/sh
-dbus-test-runner -t tests/test-service
+dbus-daemon --fork --print-address=4 --config-file /usr/share/aptdaemon/tests/dbus.conf --print-pid=5 4>/tmp/bus-addr 5>/tmp/pid-bus
+
+DBUS_SYSTEM_BUS_ADDRESS=`cat /tmp/bus-addr`
+
+/usr/sbin/console-kit-daemon &
+
+/usr/lib/accountsservice/accounts-daemon &
+
+tests/test-service
+