From 54c7d1a66feaad880588b5ba89e655e0aeab40cc Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Fri, 11 Nov 2011 13:30:09 +0000 Subject: [PATCH] df: Disable part of virt-df test. See: https://www.redhat.com/archives/libguestfs/2011-November/msg00051.html (cherry picked from commit 6e6b3ff35f9baafb22d5459ca13c112b1e00ae1b) --- df/test-virt-df.sh | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/df/test-virt-df.sh b/df/test-virt-df.sh index 6878327..38884e1 100755 --- a/df/test-virt-df.sh +++ b/df/test-virt-df.sh @@ -61,12 +61,14 @@ fi # /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). +# This test is disabled (XXX). See: +# https://www.redhat.com/archives/libguestfs/2011-November/msg00051.html -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 +#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" +# echo "$output" +# exit 1 +#fi -- 1.8.3.1