overlay/040: clean up properly after setting immutable

Test program expects only immutable on lower layer (test failure),
but does not expect the immutable file to be on the upper layer.
The later case is actually what *should* happen, except overlayfs
didn't properly implement this case yet (but is now in the works).

Signed-off-by: Miklos Szeredi <mszeredi@redhat.com>
Reviewed-by: Amir Goldstein <amir73il@gmail.com>
Signed-off-by: Eryu Guan <guaneryu@gmail.com>

diff --git a/tests/overlay/040 b/tests/overlay/040
index 369fef3c3a47dd4f21b25a0d0cb6a91ed71efdbd..4fff7570c2c600b6b8a1057d5130edbb541cd02b 100755 (executable)
--- a/tests/overlay/040
+++ b/tests/overlay/040
@@ -41,7 +41,8 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 _cleanup()
 {
        cd /
-       $CHATTR_PROG -i $lowerdir/foo
+       $CHATTR_PROG -i $lowerdir/foo > /dev/null 2>&1
+       $CHATTR_PROG -i $upperdir/foo > /dev/null 2>&1
        rm -f $tmp.*
 }
 
@@ -63,6 +64,7 @@ _scratch_mkfs
 
 # prepare lower test file
 lowerdir=$OVL_BASE_SCRATCH_MNT/$OVL_LOWER
+upperdir=$OVL_BASE_SCRATCH_MNT/$OVL_UPPER
 mkdir -p $lowerdir
 touch $lowerdir/foo