From 8312a3ebb98cb95987ef461f1d149f1b31309c9d Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Tue, 21 Feb 2017 14:57:37 +0000 Subject: [PATCH] Add a simple integration test for transient services Because this is in a subdirectory, it requires some extra `mkdir -p` and some `nobase_` variables. Make all the installed-tests `nobase_` for consistency. Signed-off-by: Simon McVittie --- test/Makefile.am | 25 +++-- test/integration/transient-services.sh | 192 +++++++++++++++++++++++++++++++++ 2 files changed, 206 insertions(+), 11 deletions(-) create mode 100644 test/integration/transient-services.sh diff --git a/test/Makefile.am b/test/Makefile.am index 09c4a7a8..42f193b9 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -135,9 +135,9 @@ EXTRA_DIST += dbus-test-runner testexecdir = $(libexecdir)/installed-tests/dbus testmetadir = $(datadir)/installed-tests/dbus -dist_testexec_SCRIPTS = -testexec_PROGRAMS = -testmeta_DATA = +nobase_dist_testexec_SCRIPTS = +nobase_testexec_PROGRAMS = +nobase_testmeta_DATA = installable_helpers = \ $(NULL) @@ -191,6 +191,7 @@ dist_installable_test_scripts += \ # Only runnable when installed, not from the source tree dist_installed_test_scripts += \ + integration/transient-services.sh \ test-apparmor-activation.sh \ $(NULL) @@ -361,14 +362,14 @@ TESTS += $(installable_tests) installcheck_tests += $(installable_tests) if DBUS_ENABLE_INSTALLED_TESTS - testexec_PROGRAMS += $(installable_helpers) - testexec_PROGRAMS += $(installable_manual_tests) - testexec_PROGRAMS += $(installable_tests) - dist_testexec_SCRIPTS += $(dist_installed_test_scripts) - dist_testexec_SCRIPTS += $(dist_installable_test_scripts) - - testmeta_DATA += $(installable_test_meta) - testmeta_DATA += $(installable_test_meta_with_config) + nobase_testexec_PROGRAMS += $(installable_helpers) + nobase_testexec_PROGRAMS += $(installable_manual_tests) + nobase_testexec_PROGRAMS += $(installable_tests) + nobase_dist_testexec_SCRIPTS += $(dist_installed_test_scripts) + nobase_dist_testexec_SCRIPTS += $(dist_installable_test_scripts) + + nobase_testmeta_DATA += $(installable_test_meta) + nobase_testmeta_DATA += $(installable_test_meta_with_config) else !DBUS_ENABLE_INSTALLED_TESTS noinst_PROGRAMS += $(installable_tests) $(installable_manual_tests) endif !DBUS_ENABLE_INSTALLED_TESTS @@ -610,6 +611,7 @@ data/valid-config-files-system/system.conf: $(top_builddir)/bus/system.conf $(AM_V_GEN)cp $< $@ $(installable_test_meta): %.test: %$(EXEEXT) Makefile + $(AM_V_at)$(MKDIR_P) $(dir $@) $(AM_V_GEN) ( \ echo '[Test]'; \ echo 'Type=session'; \ @@ -618,6 +620,7 @@ $(installable_test_meta): %.test: %$(EXEEXT) Makefile ) > $@.tmp && mv $@.tmp $@ $(installable_test_meta_with_config): %_with_config.test: %$(EXEEXT) Makefile + $(AM_V_at)$(MKDIR_P) $(dir $@) $(AM_V_GEN) ( \ echo '[Test]'; \ echo 'Type=session'; \ diff --git a/test/integration/transient-services.sh b/test/integration/transient-services.sh new file mode 100644 index 00000000..e7ea670a --- /dev/null +++ b/test/integration/transient-services.sh @@ -0,0 +1,192 @@ +#!/bin/sh + +# Copyright © 2017 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 + +if test -z "$XDG_RUNTIME_DIR"; then + echo "1..0 # SKIP - $XDG_RUNTIME_DIR is empty or unset" + exit 0 +fi + +# test -O is non-POSIX, but bash and dash have it. If it doesn't work, +# we're probably not on Linux and so would likely be skipping this test +# anyway. +if ! test -O "$XDG_RUNTIME_DIR"; then + echo "1..0 # SKIP - $XDG_RUNTIME_DIR is not ours or test -O does not work" + exit 0 +fi + +if ! test -S "$XDG_RUNTIME_DIR/bus"; then + echo "1..0 # SKIP - $XDG_RUNTIME_DIR/bus is not a socket" + exit 0 +fi + +if ! test -O "$XDG_RUNTIME_DIR/bus"; then + echo "1..0 # SKIP - $XDG_RUNTIME_DIR/bus is not ours" + exit 0 +fi + +if test -n "$DBUS_SESSION_BUS_ADDRESS" && \ + ! test "unix:path=$XDG_RUNTIME_DIR/bus" = "$DBUS_SESSION_BUS_ADDRESS"; then + echo "1..0 # SKIP - DBUS_SESSION_BUS_ADDRESS does not point to $XDG_RUNTIME_DIR/bus" + exit 0 +fi + +# Any unique token that won't collide would do here. It must start with +# a letter or underscore. +unique="t$(dbus-uuidgen)" + +if ! workdir="$(mktemp -d)"; then + echo "1..0 # SKIP - mktemp -d doesn't work" + exit 0 +fi + +cleanup () { + rm -fr "$workdir" + rm -f "$XDG_RUNTIME_DIR/dbus-1/services/com.example.DBusTests.$unique.tmp" + rm -f "$XDG_RUNTIME_DIR/dbus-1/services/com.example.DBusTests.$unique.service" + rm -f "$XDG_RUNTIME_DIR/dbus-1/services/com.example.DBusTests.Systemd.$unique.tmp" + rm -f "$XDG_RUNTIME_DIR/dbus-1/services/com.example.DBusTests.Systemd.$unique.service" + rm -f "$XDG_RUNTIME_DIR/systemd/user/dbus-com.example.DBusTests.Systemd.$unique.service" +} +trap cleanup EXIT + +echo "1..2" + +# This is an integration test, so we expect the dbus-daemon to already be +# running +if ! test -d "$XDG_RUNTIME_DIR/dbus-1/services"; then + echo "Bail out! $XDG_RUNTIME_DIR/dbus-1/services is not a directory" + exit 1 +fi + +cd "$XDG_RUNTIME_DIR/dbus-1/services" + +sed -e 's/^ *//' > "com.example.DBusTests.$unique.tmp" <&1 | sed -e 's/^/# /' + +if [ -e "$workdir/failed" ]; then + echo "Bail out! Unable to tell dbus-daemon to reload" + exit 1 +fi + +# Because the service never actually takes a bus name, we expect this to fail; +# but its exit status is ignored because it's in a pipeline. +dbus-send --session --dest="com.example.DBusTests.$unique" \ + --type=method_call --print-reply / com.example.DBusTests.ThisWillFail \ + 2>&1 | sed -e 's/^/# /' + +if [ -e "$workdir/ran-$unique" ]; then + echo "ok 1 - attempted to run transient service directly" +else + echo "not ok 1 - no sign of having run transient service" +fi + +# See whether systemd is on the session bus. +( +dbus-send --session --dest="org.freedesktop.systemd1" \ + --type=method_call --print-reply /org/freedesktop/systemd1/Manager \ + org.freedesktop.DBus.Peer.Ping || touch "$workdir/no-systemd" \ +) 2>&1 | sed -e 's/^/# /' + +if [ -d "$XDG_RUNTIME_DIR/systemd" ] && ! [ -e "$workdir/no-systemd" ]; then + + # systemd is Linux-specific, so we can assume GNU mkdir. + mkdir -p -m700 "$XDG_RUNTIME_DIR/systemd/transient" + cd "$XDG_RUNTIME_DIR/systemd/user" + + sed -e 's/^ *//' > "dbus-com.example.DBusTests.Systemd.$unique.tmp" < "com.example.DBusTests.Systemd.$unique.tmp" <&1 | sed -e 's/^/# /' + + if [ -e "$workdir/failed" ]; then + echo "Bail out! Unable to tell dbus-daemon to reload" + exit 1 + fi + + # Because the service never actually takes a bus name, we expect this to fail; + # but its exit status is ignored because it's in a pipeline. + # + # systemd never sends back an ActivationFailure message for a service + # if it starts the job but the service subsequently doesn't behave as + # intended, so use a relatively short timeout (3000ms). + dbus-send --session --dest="com.example.DBusTests.Systemd.$unique" \ + --reply-timeout=3000 --type=method_call --print-reply \ + / com.example.DBusTests.ThisWillFail \ + 2>&1 | sed -e 's/^/# /' + + if [ -e "$workdir/ran-$unique-via-systemd" ]; then + echo "ok 2 - attempted to run transient service via systemd" + elif [ -e "$workdir/ran-$unique-wrong" ]; then + echo "not ok 2 - ran transient service incorrectly" + else + echo "not ok 2 - no sign of having run transient service" + fi +else + echo "ok 2 # SKIP session bus does not appear to be managed by systemd" +fi + +echo "# Done." +cleanup +trap '' EXIT +exit 0 -- 2.11.0