From 572c6cc10a8d5a4455a001e2d5471ebc82e7091b Mon Sep 17 00:00:00 2001
From: Jim Meyering <jim@meyering.net>
Date: Tue, 25 May 2010 21:12:01 +0200
Subject: [PATCH] tests: avoid new failure of the daemon-conf test

* tests/daemon-conf: Accommodate the fact that out template,
daemon/libvirtd.conf now contains an invalid host_uuid.
Convert it to a valid one before the final libvirtd-running
test that must terminate normally.
---
 tests/daemon-conf | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/tests/daemon-conf b/tests/daemon-conf
index 14d4cede68..0e756d4538 100755
--- a/tests/daemon-conf
+++ b/tests/daemon-conf
@@ -83,7 +83,11 @@ if test 108 -lt `echo $SOCKPATH | wc -c`; then
     skip_test_ "CWD too long"
 fi
 
-$abs_top_builddir/daemon/libvirtd --pid-file=pid-file --config=tmp.conf > log 2>&1 & pid=$!
+# Replace the invalid host_uuid with one that is valid:
+sed 's/^\(host_uuid =.*\)0"$/\11"/' 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