]> xenbits.xensource.com Git - libvirt.git/commitdiff
tests: avoid new failure of the daemon-conf test
authorJim Meyering <jim@meyering.net>
Tue, 25 May 2010 19:12:01 +0000 (21:12 +0200)
committerEric Blake <eblake@redhat.com>
Tue, 25 May 2010 21:53:19 +0000 (15:53 -0600)
* 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

index 14d4cede68e44869692d93f3879f508e3cd25b88..0e756d453845febf10a8d68b034d7df273fc3ac1 100755 (executable)
@@ -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