Skip to content
Snippets Groups Projects
Commit a483028d authored by Guido Günther's avatar Guido Günther
Browse files

Daemon tests changed so update the patches

parent a469ff65
No related branches found
No related tags found
No related merge requests found
From: =?UTF-8?q?Guido=20G=C3=BCnther?= <agx@sigxcpu.org>
Date: Sat, 16 Apr 2011 13:36:08 +0200
Subject: Disable daemon start test
since we don't have sys. This is a workaround only.
---
tests/daemon-conf | 12 ------------
1 files changed, 0 insertions(+), 12 deletions(-)
diff --git a/tests/daemon-conf b/tests/daemon-conf
index 6aa3269..4dac92e 100755
--- a/tests/daemon-conf
+++ b/tests/daemon-conf
@@ -97,18 +97,6 @@ fi
sed 's/^\(host_uuid =.*\)0"$/\11"/; s/^\(audit_level =.*\)2$/\1 1/' tmp.conf > k
mv k tmp.conf
-$abs_top_builddir/daemon/libvirtd --pid-file=pid-file --config=tmp.conf \
- > log 2>&1 & pid=$!
-sleep $sleep_secs
-kill $pid
-
-RET=0
-# Expect an orderly shut-down and successful exit.
-wait $pid || RET=1
-
-test_result $i "valid config file (sleeping $sleep_secs seconds)" $RET
-test $RET = 0 || fail=1
-
test_final $i $fail
# "cat log" would print this for non-root:
Message-Id: <b3b5bf1ad7c56d826426b7f7974117ef5b2590e4.1336929172.git.agx@sigxcpu.org>
In-Reply-To: <3212167ef5921de92659b7f6bf21d29fad1e4aa6.1336929172.git.agx@sigxcpu.org>
References: <3212167ef5921de92659b7f6bf21d29fad1e4aa6.1336929172.git.agx@sigxcpu.org>
From: Guido Guenther <agx@sigxcpu.org>
Date: Thu, 26 Jun 2008 20:01:38 +0200
Subject: Allow libvirt group to access the socket
---
daemon/libvirtd.conf | 8 ++++----
tests/daemon-conf | 7 ++++++-
2 files changed, 10 insertions(+), 5 deletions(-)
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/daemon/libvirtd.conf b/daemon/libvirtd.conf
index 3eab2be..eb183f0 100644
index 50eda1b..21cfcce 100644
--- a/daemon/libvirtd.conf
+++ b/daemon/libvirtd.conf
@@ -78,7 +78,7 @@
......@@ -47,21 +49,3 @@ index 3eab2be..eb183f0 100644
# Change the authentication scheme for TCP sockets.
#
diff --git a/tests/daemon-conf b/tests/daemon-conf
index f2b513d..6aa3269 100755
--- a/tests/daemon-conf
+++ b/tests/daemon-conf
@@ -19,7 +19,12 @@ grep '^#define WITH_QEMU 1' "$CONFIG_HEADER" > /dev/null ||
conf="$abs_top_srcdir/daemon/libvirtd.conf"
# Ensure that each commented out PARAMETER = VALUE line has the expected form.
-grep -v '\"PARAMETER = VALUE\"' "$conf" | grep '[a-z_] *= *[^ ]' | grep -vE '^#[a-z_]+ = ' \
+grep -v -e '\"PARAMETER = VALUE\"' \
+ -e 'unix_sock_group = \"libvirt\"' \
+ -e 'unix_sock_rw_perms = \"0770\"' \
+ -e 'auth_unix_ro = \"none\"' \
+ -e 'auth_unix_rw = \"none\"' \
+ "$conf" | grep '[a-z_] *= *[^ ]' | grep -vE '^#[a-z_]+ = ' \
&& { echo "$0: found unexpected lines (above) in $conf" 1>&2; exit 1; }
# Start with the sample libvirtd.conf file, uncommenting all real directives.
......@@ -6,8 +6,6 @@ debian/Debianize-libvirt-guests.patch
debian/Don-t-require-gawk-for-a-simple-print-expression.patch
patch-qemuMonitorTextGetMigrationStatus-to-intercept.patch
virsh-Initialize-library-before-calling-virResetLast.patch
Disable-daemon-start-test.patch
Disable-gnulib-s-test-nonplocking-pipe.sh.patch
Disable-failing-virnetsockettest.patch
Don-t-fail-if-we-can-t-setup-avahi.patch
virURIParse-don-t-forget-to-copy-the-user-part.patch
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment