generic/079: use _require_test_program

use _require_test_program helper and specify both +i and +a
to _required_chattr, because test sets them both.

Also remove unneeded _scratch_unmount from _cleanup.

Signed-off-by: Amir Goldstein <amir73il@gmail.com>
Reviewed-by: Eryu Guan <eguan@redhat.com>
Signed-off-by: Eryu Guan <eguan@redhat.com>

diff --git a/tests/generic/079 b/tests/generic/079
index 5cceeba0bfcd5324a366e9cf9b86a3a92301c087..c2db6bf1f744217191592e1f9c528656992cf6b4 100755 (executable)
--- a/tests/generic/079
+++ b/tests/generic/079
@@ -37,7 +37,6 @@ _cleanup()
     cd /
     echo "*** cleaning up"
     $timmutable -r $SCRATCH_MNT/$seq
     cd /
     echo "*** cleaning up"
     $timmutable -r $SCRATCH_MNT/$seq

-    _scratch_unmount

 }
 
 # get standard environment, filters and checks
 }
 
 # get standard environment, filters and checks


@@ -48,11 +47,10 @@ _cleanup()
 _supported_fs generic
 _supported_os Linux
 
 _supported_fs generic
 _supported_os Linux
 

-_require_chattr i
+_require_chattr ia
+_require_test_program "t_immutable"

 _require_scratch
 
 _require_scratch
 

-[ -x $timmutable ] || _notrun "t_immutable was not built for this platform"
-

 # real QA test starts here
 _scratch_mkfs >/dev/null 2>&1 || _fail "mkfs failed"
 _scratch_mount || _fail "mount failed"
 # real QA test starts here
 _scratch_mkfs >/dev/null 2>&1 || _fail "mkfs failed"
 _scratch_mount || _fail "mount failed"