X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=tools%2Ftest-virt-df.sh;h=6878327d587711a1a166e91638a78f59b2570f7e;hb=f8af59c234b6bea50dadc7a6055c8a4739ca4530;hp=8e6106326fcfab99d533aa113062fe031d2a9086;hpb=fc5fbd460aa0aaf6bb65ca5fa1be59345f4f079f;p=libguestfs.git

diff --git a/tools/test-virt-df.sh b/tools/test-virt-df.sh
index 8e61063..6878327 100755
--- a/tools/test-virt-df.sh
+++ b/tools/test-virt-df.sh
@@ -4,13 +4,10 @@ export LANG=C
 set -e
 
 # Run virt-df.
-output=$(./virt-df test.img -h)
-
-# The output will be slightly different from one machine to another.
-# So just do some tests to make sure it looks reasonable.
+output=$(./virt-df ../images/fedora.img)
 
 # Check title is the first line.
-if [[ ! $output =~ ^Filesystem[[:space:]]+Size[[:space:]]+Used[[:space:]]+Available[[:space:]]+Use% ]]; then
+if [[ ! $output =~ ^Filesystem.* ]]; then
     echo "$0: error: no title line"
     exit 1
 fi
@@ -22,25 +19,54 @@ if [ $(echo "$output" | wc -l) -ne 6 ]; then
 fi
 
 # Check /dev/VG/LV[1-3] and /dev/VG/Root were found.
-if [[ ! $output =~ test.img:/dev/VG/LV1 ]]; then
+if [[ ! $output =~ fedora.img:/dev/VG/LV1 ]]; then
     echo "$0: error: filesystem /dev/VG/LV1 was not found"
     exit 1
 fi
-if [[ ! $output =~ test.img:/dev/VG/LV2 ]]; then
+if [[ ! $output =~ fedora.img:/dev/VG/LV2 ]]; then
     echo "$0: error: filesystem /dev/VG/LV2 was not found"
     exit 1
 fi
-if [[ ! $output =~ test.img:/dev/VG/LV3 ]]; then
+if [[ ! $output =~ fedora.img:/dev/VG/LV3 ]]; then
     echo "$0: error: filesystem /dev/VG/LV3 was not found"
     exit 1
 fi
-if [[ ! $output =~ test.img:/dev/VG/Root ]]; then
+if [[ ! $output =~ fedora.img:/dev/VG/Root ]]; then
     echo "$0: error: filesystem /dev/VG/Root was not found"
     exit 1
 fi
 
 # Check /dev/sda1 was found.  Might be called /dev/vda1.
-if [[ ! $output =~ test.img:/dev/[hsv]da1 ]]; then
+if [[ ! $output =~ fedora.img:/dev/[hsv]da1 ]]; then
     echo "$0: error: filesystem /dev/VG/sda1 was not found"
     exit 1
 fi
+
+# This is what df itself prints for these filesystems (determined
+# by running the test image under virt-rescue):
+#
+# ><rescue> df -h
+# Filesystem            Size  Used Avail Use% Mounted on
+# /dev/dm-1              31M   28K   30M   1% /sysroot/lv1
+# /dev/dm-2              31M  395K   29M   2% /sysroot/lv2
+# /dev/dm-3              62M  144K   59M   1% /sysroot/lv3
+# ><rescue> df -i
+# Filesystem            Inodes   IUsed   IFree IUse% Mounted on
+# /dev/dm-1               8192      11    8181    1% /sysroot/lv1
+# /dev/dm-2               8192      11    8181    1% /sysroot/lv2
+# /dev/dm-3              16384      11   16373    1% /sysroot/lv3
+# ><rescue> df
+# Filesystem           1K-blocks      Used Available Use% Mounted on
+# /dev/dm-1                31728        28     30064   1% /sysroot/lv1
+# /dev/dm-2                31729       395     29696   2% /sysroot/lv2
+# /dev/dm-3                63472       144     60052   1% /sysroot/lv3
+#
+# Only test plain 'df' output at the moment (XXX).
+
+if [ "$(echo "$output" | sort | awk '/VG.LV[123]/ { print $2 " " $3 " " $4 " " $5 }')" != \
+"31728 28 30064 1%
+31729 395 29696 2%
+63472 144 60052 1%" ]; then
+    echo "$0: error: output of virt-df did not match expected (df) output"
+    exit 1
+fi