diff options
| author | Will Thompson <will.thompson@collabora.co.uk> | 2011-09-15 16:22:10 +0100 |
|---|---|---|
| committer | Will Thompson <will.thompson@collabora.co.uk> | 2011-09-21 19:27:13 +0100 |
| commit | 4aea67ec672ffbec19d7280bc6cd6b70cccd5607 (patch) | |
| tree | 5377f2f85240d448b9e51b0ed6ad0e9854adb74c /tests | |
| parent | 1e0f118d843d16874969e8d4b8a380a7bdf2bec3 (diff) | |
tests: update with-session-bus.sh
This gives us --also-for-system, which will be useful for testing NM
integration.
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/twisted/tools/with-session-bus.sh | 34 |
1 files changed, 31 insertions, 3 deletions
diff --git a/tests/twisted/tools/with-session-bus.sh b/tests/twisted/tools/with-session-bus.sh index 320c8e9a..1b8990e6 100644 --- a/tests/twisted/tools/with-session-bus.sh +++ b/tests/twisted/tools/with-session-bus.sh @@ -15,6 +15,7 @@ set -e me=with-session-bus dbus_daemon_args="--print-address=5 --print-pid=6 --fork" +sleep=0 usage () { @@ -29,6 +30,11 @@ usage () while test "z$1" != "z--"; do case "$1" in + --sleep=*) + sleep="$1" + sleep="${sleep#--sleep=}" + shift + ;; --session) dbus_daemon_args="$dbus_daemon_args --session" shift @@ -38,6 +44,10 @@ while test "z$1" != "z--"; do dbus_daemon_args="$dbus_daemon_args $1" shift ;; + --also-for-system) + with_system_bus=1 + shift + ;; *) usage ;; @@ -53,7 +63,9 @@ cleanup () { pid=`head -n1 $me-$$.pid` if test -n "$pid" ; then - echo "Killing temporary bus daemon: $pid" >&2 + if [ -n "$CHECK_TWISTED_VERBOSE" ] || [ -n "$VERBOSE_TESTS" ]; then + echo "Killing temporary bus daemon: $pid" >&2 + fi kill -INT "$pid" fi rm -f $me-$$.address @@ -63,21 +75,37 @@ cleanup () trap cleanup INT HUP TERM dbus-daemon $dbus_daemon_args -{ echo -n "Temporary bus daemon is "; cat $me-$$.address; } >&2 -{ echo -n "Temporary bus daemon PID is "; head -n1 $me-$$.pid; } >&2 +if [ -n "$CHECK_TWISTED_VERBOSE" ] || [ -n "$VERBOSE_TESTS" ]; then + { echo -n "Temporary bus daemon is "; cat $me-$$.address; } >&2 + { echo -n "Temporary bus daemon PID is "; head -n1 $me-$$.pid; } >&2 +fi e=0 DBUS_SESSION_BUS_ADDRESS="`cat $me-$$.address`" export DBUS_SESSION_BUS_ADDRESS +if [ -n "$with_system_bus" ] ; then + DBUS_SYSTEM_BUS_ADDRESS="$DBUS_SESSION_BUS_ADDRESS" + export DBUS_SYSTEM_BUS_ADDRESS +fi + if [ -n "$WITH_SESSION_BUS_FORK_DBUS_MONITOR" ] ; then echo "Forking dbus-monitor $WITH_SESSION_BUS_FORK_DBUS_MONITOR_OPT" >&2 dbus-monitor $WITH_SESSION_BUS_FORK_DBUS_MONITOR_OPT \ > $me-$$.dbus-monitor-logs 2>&1 & fi +if [ -n "$GABBLE_TEST_BUSTLE" ]; then + echo "Forking bustle-dbus-monitor" >&2 + bustle-dbus-monitor > tools/$me-$$.bustle-logs 2>&1 & +fi + "$@" || e=$? +if test $sleep != 0; then + sleep $sleep +fi + trap - INT HUP TERM cleanup |