Revert "generic/38[3-6]: require project quota to be enabled on SCRATCH_DEV"

Commit 23f60ef304d ("generic/38[3-6]: require project quota to be
enabled on SCRATCH_DEV") introduced a regression that leads
_require_projquota, which uses src/feature to call a quotactl,
operate before the filesystem is mounted, and results in tests not
run on XFS and ext4.

Revert the problematic patch first, because don't want to lose
project quota test coverage on XFS and ext4. We can fix the false
failure on ext3/2 later,

Reported-by: Eric Sandeen <sandeen@redhat.com>
Reviewed-by: Eric Sandeen <sandeen@redhat.com>
Signed-off-by: Eryu Guan <eguan@redhat.com>

diff --git a/tests/generic/383 b/tests/generic/383
index 93836eaa9bfcb19fe934a97be7754f5c06df12dd..be5b19b75703eb767855fa84eb3eb3398a3d7268 100755 (executable)
--- a/tests/generic/383
+++ b/tests/generic/383
@@ -54,7 +54,6 @@ _require_xfs_quota_foreign
 
 _scratch_mkfs >/dev/null 2>&1
 _scratch_enable_pquota
-_require_prjquota $SCRATCH_DEV
 
 do_project_test()
 {

diff --git a/tests/generic/384 b/tests/generic/384
index 4784e47fc11e477e0d457b6f3097550b8be5e0a3..452d26e34e39d393bff8a805edbfe85390b79d37 100755 (executable)
--- a/tests/generic/384
+++ b/tests/generic/384
@@ -73,10 +73,10 @@ chmod a+rwx $seqres.full    # arbitrary users will write here
 _require_scratch
 _scratch_mkfs >/dev/null 2>&1
 _scratch_enable_pquota
-_require_prjquota $SCRATCH_DEV
 
 _qmount_option "prjquota"
 _qmount
+_require_prjquota $SCRATCH_DEV
 
 report_quota()
 {

diff --git a/tests/generic/385 b/tests/generic/385
index b7c5bd39569c200bf86e2b48a6ada9dcecefce29..f07ae5d5b00f9a38c611946c23212e96e641ca82 100755 (executable)
--- a/tests/generic/385
+++ b/tests/generic/385
@@ -71,9 +71,9 @@ quota_cmd="$XFS_QUOTA_PROG -D $tmp.projects -P $tmp.projid"
 
 _scratch_mkfs >/dev/null 2>&1
 _scratch_enable_pquota
-_require_prjquota $SCRATCH_DEV
 _qmount_option "prjquota"
 _qmount
+_require_prjquota $SCRATCH_DEV
 
 #
 # Create the project root

diff --git a/tests/generic/386 b/tests/generic/386
index 0ceb14de9239fb6f7a0cdfcc2c7f7e43b2aa8177..3aede60b68a1e6035d708a296bfb13c947270d57 100755 (executable)
--- a/tests/generic/386
+++ b/tests/generic/386
@@ -127,10 +127,10 @@ echo $proj_num:$proj_dir > "$my_projects"
 
 _scratch_mkfs                                  >> "$seqres.full" 2>&1
 _scratch_enable_pquota
-_require_prjquota $SCRATCH_DEV
 
 _qmount_option "prjquota"
 _qmount
+_require_prjquota $SCRATCH_DEV
 
 mkdir -p "${proj_dir}"