Attachment 125208 Details for Bug 97008 – Add a simple test for dbus-daemon --fork

[patch] Add a simple test for dbus-daemon --fork

Add-a-simple-test-for-dbus-daemon---fork.patch (text/plain), 3.42 KB, created by Simon McVittie on 2016-07-21 10:21:17 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Simon McVittie

Created: 2016-07-21 10:21:17 UTC

Size: 3.42 KB

patch

obsolete

>From 55263000756a86fb89a3da822b31d56107b34cb5 Mon Sep 17 00:00:00 2001
>From: Simon McVittie <smcv@debian.org>
>Date: Wed, 20 Jul 2016 13:12:45 +0100
>Subject: [PATCH] Add a simple test for dbus-daemon --fork
>
>Signed-off-by: Simon McVittie <smcv@debian.org>
>---
> test/Makefile.am              |  4 +++
> test/test-dbus-daemon-fork.sh | 68 +++++++++++++++++++++++++++++++++++++++++++
> 2 files changed, 72 insertions(+)
> create mode 100755 test/test-dbus-daemon-fork.sh
>
>diff --git a/test/Makefile.am b/test/Makefile.am
>index ed2947a..a588077 100644
>--- a/test/Makefile.am
>+++ b/test/Makefile.am
>@@ -168,6 +168,10 @@ installable_tests += \
> 	test-sd-activation \
> 	$(NULL)
> 
>+dist_installable_test_scripts += \
>+	test-dbus-daemon-fork.sh \
>+	$(NULL)
>+
> # Testing dbus-launch relies on special code in that binary.
> if DBUS_ENABLE_EMBEDDED_TESTS
> dist_installable_test_scripts += \
>diff --git a/test/test-dbus-daemon-fork.sh b/test/test-dbus-daemon-fork.sh
>new file mode 100755
>index 0000000..aefc2c6
>--- /dev/null
>+++ b/test/test-dbus-daemon-fork.sh
>@@ -0,0 +1,68 @@
>+#!/bin/sh
>+
>+# Copyright Â© 2016 Collabora Ltd.
>+#
>+# Permission is hereby granted, free of charge, to any person
>+# obtaining a copy of this software and associated documentation files
>+# (the "Software"), to deal in the Software without restriction,
>+# including without limitation the rights to use, copy, modify, merge,
>+# publish, distribute, sublicense, and/or sell copies of the Software,
>+# and to permit persons to whom the Software is furnished to do so,
>+# subject to the following conditions:
>+#
>+# The above copyright notice and this permission notice shall be
>+# included in all copies or substantial portions of the Software.
>+#
>+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
>+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
>+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
>+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
>+# BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
>+# ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
>+# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
>+# SOFTWARE.
>+
>+set -e
>+
>+export DBUS_DEBUG_OUTPUT=1
>+echo "# dbus-daemon binary: ${DBUS_TEST_DAEMON:=dbus-daemon}"
>+echo "# dbus-send binary: ${DBUS_TEST_DBUS_SEND:=dbus-send}"
>+
>+if test -n "$DBUS_TEST_DATA"; then
>+    echo "# test data: $DBUS_TEST_DATA"
>+    config="--config-file=$DBUS_TEST_DATA/valid-config-files/session.conf"
>+elif test -n "$DBUS_TEST_DATADIR"; then
>+    echo "# datadir: $DBUS_TEST_DATADIR"
>+    config="--config-file=$DBUS_TEST_DATADIR/dbus-1/session.conf"
>+else
>+    echo "# using standard session bus configuration"
>+    config="--session"
>+fi
>+
>+if ! workdir="$(mktemp -d)"; then
>+    echo "1..0 # SKIP - mktemp -d doesn't work"
>+    exit 0
>+fi
>+
>+echo "1..1"
>+
>+unset DBUS_SESSION_BUS_ADDRESS
>+unset DBUS_SESSION_BUS_PID
>+rm -f "$workdir"/address "$workdir"/pid
>+
>+${DBUS_TEST_DAEMON} --fork --print-address=8 --print-pid=9 "$config" \
>+    8>"$workdir/address" 9>"$workdir/pid"
>+
>+export DBUS_SESSION_BUS_ADDRESS="$(cat "$workdir"/address)"
>+test -n "$DBUS_SESSION_BUS_ADDRESS"
>+DBUS_SESSION_BUS_PID="$(cat "$workdir"/pid)"
>+kill -0 "$DBUS_SESSION_BUS_PID"
>+
>+${DBUS_TEST_DBUS_SEND} --session --dest=org.freedesktop.DBus \
>+    --type=method_call --print-reply / org.freedesktop.DBus.ListNames >&2
>+
>+kill "$DBUS_SESSION_BUS_PID"
>+
>+echo "ok 1 - normal dbus-daemon"
>+
>+rm -r "$workdir"
>-- 
>2.8.1

Actions: View | Splinter Review

Attachments on bug 97008: 125161 | 125162 | 125163 | 125164 | 125165 | 125166 | 125167 | 125168 | 125169 | 125170 | 125207 | 125208 | 125210 | 125212 | 125213 | 125215 | 125217 | 125218 | 125219 | 125220 | 125221

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.