[Pkg-libvirt-commits] [SCM] Libguestfs Debian packaging branch, experimental, updated. debian/1%1.21.40-1

[Richard W.M. Jones]

The following commit has been merged in the experimental branch:
commit 93e64b4448c7afccf4c4751ff5deba3e321e7851
Author: Richard W.M. Jones <rjones at redhat.com>
Date:   Mon Apr 29 19:25:14 2013 +0100

    tests/mountable: Fix incorrect use of inspect-os API (RHBZ#957380).

diff --git a/tests/mountable/test-mountable-inspect.sh b/tests/mountable/test-mountable-inspect.sh
index 5e3ec2d..f9e82bc 100755
--- a/tests/mountable/test-mountable-inspect.sh
+++ b/tests/mountable/test-mountable-inspect.sh
@@ -34,7 +34,7 @@ if ! $guestfish -a /dev/null run : available btrfs; then
     exit 77
 fi
 
-rm -f test.qcow2 test.output
+rm -f root.tmp test.qcow2 test.output
 
 # Start with the regular (good) fedora image, modify /etc/fstab
 # and then inspect it.
@@ -43,7 +43,8 @@ qemu-img create -F raw -b ../guests/fedora-btrfs.img -f qcow2 test.qcow2
 # Test that basic inspection works and the expected filesystems are
 # found
 $guestfish -a test.qcow2 -i <<'EOF' | sort | $canonical > test.output
-  inspect-get-mountpoints btrfsvol:/dev/sda2/root
+  inspect-get-roots | head -1 > root.tmp
+  <! echo inspect-get-mountpoints "`cat root.tmp`"
 EOF
 
 if [ "$(cat test.output)" != "/: btrfsvol:/dev/sda2/root
@@ -56,7 +57,8 @@ fi
 
 # Additional sanity check: did we get the release name right?
 $guestfish -a test.qcow2 -i <<'EOF' > test.output
-  inspect-get-product-name btrfsvol:/dev/sda2/root
+  inspect-get-roots | head -1 > root.tmp
+  <! echo inspect-get-product-name "`cat root.tmp`"
 EOF
 
 if [ "$(cat test.output)" != "Fedora release 14 (Phony)"]; then
@@ -65,5 +67,6 @@ if [ "$(cat test.output)" != "Fedora release 14 (Phony)"]; then
     exit 1
 fi
 
+rm root.tmp
 rm test.qcow2
 rm test.output

-- 
Libguestfs Debian packaging