fstests: modify user name beginning with non-digit

openSUSE and SLE don't support username begin with digit, so it will
skip test generic/597 and generic/598 by lack of 123456-fsgqa user.
generic/597 and 598 are not test username begin with digit on purpose
(different with generic/381). It's will be helpful to use an username
begin with non-digit in this case.

Signed-off-by: Sun Yong <yosun@suse.com>
Reviewed-by: Petr Vorel <pvorel@suse.cz>
Signed-off-by: Eryu Guan <guaneryu@gmail.com>

diff --git a/README b/README
index 094a77422ea1c7a50928c59925da1e7a4ea65ed2..f1fac39978d14cf14cb120120d77c194d5eabadd 100644 (file)
--- a/README
+++ b/README
@@ -22,6 +22,7 @@ _______________________
 - create fsgqa test user ("sudo useradd -m fsgqa")
 - create fsgqa group ("sudo groupadd fsgqa")
 - create 123456-fsgqa test user ("sudo useradd 123456-fsgqa")
+- create fsgqa2 test user ("sudo useradd fsgqa2")
 
 ______________________
 USING THE FSQA SUITE

diff --git a/tests/generic/597 b/tests/generic/597
index 1d87a23a3f73db5e5b29ed79f3903d434d5b0608..df6911a15d600173db0de3f56f1b1d432a9a3725 100755 (executable)
--- a/tests/generic/597
+++ b/tests/generic/597
@@ -41,13 +41,11 @@ _supported_os Linux
 _require_test
 _require_sysctl_variable fs.protected_symlinks
 _require_sysctl_variable fs.protected_hardlinks
-# su in _require_user prints warnings about user name starts with a digit,
-# discard the warning
-_require_user 123456-fsgqa >/dev/null 2>&1
+_require_user fsgqa2
 # Do this SECOND so that qa_user is fsgqa, and _user_do uses that account
 _require_user fsgqa
 
-OWNER=123456-fsgqa
+OWNER=fsgqa2
 OTHER=fsgqa
 
 # Save current system state to reset when done

diff --git a/tests/generic/598 b/tests/generic/598
index 998b62cfd0312575a03a1dd5b18f8082294a2b17..119d5644609fb9af5f1937e6837ec6a4a22c01bc 100755 (executable)
--- a/tests/generic/598
+++ b/tests/generic/598
@@ -41,13 +41,11 @@ _supported_os Linux
 _require_test
 _require_sysctl_variable fs.protected_regular
 _require_sysctl_variable fs.protected_fifos
-# su in _require_user prints warnings about user name starts with a digit,
-# discard the warning
-_require_user 123456-fsgqa >/dev/null 2>&1
+_require_user fsgqa2
 # Do this SECOND so that qa_user is fsgqa, and _user_do uses that account
 _require_user fsgqa
 
-USER1=123456-fsgqa
+USER1=fsgqa2
 USER2=fsgqa
 
 # Save current system state to reset when done