Skip to contentSkip to conversation

su01: do pre-checking to avoid annoying warnings

PATCH New Han 3 participants 3 messages Dec 2, 2016 – Dec 5, 2016

lore
Share & tools
lore

Han

#0 lore raw

PATCH 1/1 su01: do pre-checking to avoid annoying warnings

do pre-checking of file/directory/user to avoid warnings like:
mkdir: cannot create directory '/home/su_usr1': File exists

Signed-off-by Ning Han <[email protected]>

---
testcases/commands/su/su01 | 12 ++++++------

1 file changed, 6 insertions(+), 6 deletions(-)
testcases/commands/su/su01 +6 -6
index dd1517f..9510f29 100755
@@ -85,8 +85,8 @@ rm -f $TEST_ENV_FILE > /dev/null 2>&1
 #Create 1st test user
     #erase user if he may exist , so we can have a clean en
-        rm -rf /home/$TEST_USER1
-        userdel $TEST_USER1
+        [ -e /home/$TEST_USER1 ] && rm -rf /home/$TEST_USER1
+        getent passwd $TEST_USER1 && userdel $TEST_USER1
               sleep 1
         useradd -m -g users $TEST_USER1

@@ -105,7 +105,7 @@ rm -f $TEST_ENV_FILE > /dev/null 2>&1
               then {
           USER_UID=`id -u $TEST_USER1`
           USER_GID=`id -g $TEST_USER1`
-          mkdir $TEST_USER1_HOMEDIR
+          [ -e $TEST_USER1_HOMEDIR ] || mkdir $TEST_USER1_HOMEDIR
           chown -R $USER_UID.$USER_GID $TEST_USER1_HOMEDIR
               }
               fi

@@ -120,8 +120,8 @@ rm -f $TEST_ENV_FILE > /dev/null 2>&1
 #Create 2nd test user
               #erase user if he may exist , so we can have a clean en
-        rm -rf /home/$TEST_USER2
-        userdel $TEST_USER2
+        [ -e /home/$TEST_USER2 ] && rm -rf /home/$TEST_USER2
+        getent passwd $TEST_USER2 && userdel $TEST_USER2
               sleep 1
         useradd -m -g users $TEST_USER2

@@ -141,7 +141,7 @@ rm -f $TEST_ENV_FILE > /dev/null 2>&1
         then {
           USER_UID=`id -u $TEST_USER2`
           USER_GID=`id -g $TEST_USER2`
-          mkdir $TEST_USER2_HOMEDIR
+          [ -e $TEST_USER2_HOMEDIR ] || mkdir $TEST_USER2_HOMEDIR
           chown -R $USER_UID.$USER_GID $TEST_USER2_HOMEDIR
               }
               fi

--
2.7.4
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.linux.it/pipermail/ltp/attachments/20161202/bbdfed0e/attachment.html>

#1 lore raw

PATCH 1/1 su01: do pre-checking to avoid annoying warnings

Hi,

Quoted 13 lines

do pre-checking of file/directory/user to avoid warnings like:
mkdir: cannot create directory '/home/su_usr1': File exists

Signed-off-by Ning Han <[email protected]>

---
testcases/commands/su/su01 | 12 ++++++------

1 file changed, 6 insertions(+), 6 deletions(-)
testcases/commands/su/su01 +0 -0
index dd1517f..9510f29 100755

testcases/commands/su/su01 rm -f $TEST_ENV_FILE > /dev/null 2>&1 · line 87

Quoted 5 lines
testcases/commands/su/su01 +1 -2
@@ -85,8 +85,8 @@ rm -f $TEST_ENV_FILE > /dev/null 2>&1
 #Create 1st test user
     #erase user if he may exist , so we can have a clean en
-        rm -rf /home/$TEST_USER1
-        userdel $TEST_USER1
+        [ -e /home/$TEST_USER1 ] && rm -rf /home/$TEST_USER1

-f parameter doesn't produce any error message (ignore nonexistent files).

testcases/commands/su/su01 rm -f $TEST_ENV_FILE > /dev/null 2>&1 · line 108

Quoted 9 lines
testcases/commands/su/su01 +2 -1
+        getent passwd $TEST_USER1 && userdel $TEST_USER1
               sleep 1
         useradd -m -g users $TEST_USER1

@@ -105,7 +105,7 @@ rm -f $TEST_ENV_FILE > /dev/null 2>&1
               then {
           USER_UID=`id -u $TEST_USER1`
           USER_GID=`id -g $TEST_USER1`
-          mkdir $TEST_USER1_HOMEDIR
+          [ -e $TEST_USER1_HOMEDIR ] || mkdir $TEST_USER1_HOMEDIR

Use -p parameter?

Quoted 13 lines
testcases/commands/su/su01 +2 -2
           chown -R $USER_UID.$USER_GID $TEST_USER1_HOMEDIR
               }
               fi

@@ -120,8 +120,8 @@ rm -f $TEST_ENV_FILE > /dev/null 2>&1
 #Create 2nd test user
               #erase user if he may exist , so we can have a clean en
-        rm -rf /home/$TEST_USER2
-        userdel $TEST_USER2
+        [ -e /home/$TEST_USER2 ] && rm -rf /home/$TEST_USER2
+        getent passwd $TEST_USER2 && userdel $TEST_USER2
               sleep 1
         useradd -m -g users $TEST_USER2

testcases/commands/su/su01 rm -f $TEST_ENV_FILE > /dev/null 2>&1 · line 147

Quoted 8 lines
testcases/commands/su/su01 +1 -1
@@ -141,7 +141,7 @@ rm -f $TEST_ENV_FILE > /dev/null 2>&1
         then {
           USER_UID=`id -u $TEST_USER2`
           USER_GID=`id -g $TEST_USER2`
-          mkdir $TEST_USER2_HOMEDIR
+          [ -e $TEST_USER2_HOMEDIR ] || mkdir $TEST_USER2_HOMEDIR
           chown -R $USER_UID.$USER_GID $TEST_USER2_HOMEDIR
               }
               fi

Kind regards,
Petr
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: not available
URL: <http://lists.linux.it/pipermail/ltp/attachments/20161202/8bf4d06a/attachment.sig>

#2 lore raw

PATCH 1/1 su01: do pre-checking to avoid annoying warnings

On Fri, Dec 02, 2016 at 03:45:08PM +0800, Petr Vorel wrote:
Hi,

Quoted 10 lines

Hi,

Quoted 7 lines

do pre-checking of file/directory/user to avoid warnings like:
mkdir: cannot create directory '/home/su_usr1': File exists

Signed-off-by Ning Han <[email protected]>

---
testcases/commands/su/su01 | 12 ++++++------

1 file changed, 6 insertions(+), 6 deletions(-)
Quoted 11 lines

testcases/commands/su/su01 rm -f $TEST_ENV_FILE > /dev/null 2>&1 · line 87

Quoted 10 lines
testcases/commands/su/su01 +1 -2
index dd1517f..9510f29 100755
@@ -85,8 +85,8 @@ rm -f $TEST_ENV_FILE > /dev/null 2>&1
 #Create 1st test user
     #erase user if he may exist , so we can have a clean en
-        rm -rf /home/$TEST_USER1
-        userdel $TEST_USER1
+        [ -e /home/$TEST_USER1 ] && rm -rf /home/$TEST_USER1

-f parameter doesn't produce any error message (ignore nonexistent files).

Thanks. With -p parameter it never prompts. Checking is not necessary. Let's remove it.

Quoted 11 lines

testcases/commands/su/su01 rm -f $TEST_ENV_FILE > /dev/null 2>&1 · line 108

Quoted 10 lines
testcases/commands/su/su01 +2 -1
+        getent passwd $TEST_USER1 && userdel $TEST_USER1
               sleep 1
         useradd -m -g users $TEST_USER1

@@ -105,7 +105,7 @@ rm -f $TEST_ENV_FILE > /dev/null 2>&1
               then {
           USER_UID=`id -u $TEST_USER1`
           USER_GID=`id -g $TEST_USER1`
-          mkdir $TEST_USER1_HOMEDIR
+          [ -e $TEST_USER1_HOMEDIR ] || mkdir $TEST_USER1_HOMEDIR

Use -p parameter?

'useradd -m' has created user's home directory in our environment.

Quoted 26 lines
Quoted 14 lines
testcases/commands/su/su01 +2 -2
           chown -R $USER_UID.$USER_GID $TEST_USER1_HOMEDIR
               }
               fi

@@ -120,8 +120,8 @@ rm -f $TEST_ENV_FILE > /dev/null 2>&1
 #Create 2nd test user
               #erase user if he may exist , so we can have a clean en
-        rm -rf /home/$TEST_USER2
-        userdel $TEST_USER2
+        [ -e /home/$TEST_USER2 ] && rm -rf /home/$TEST_USER2
+        getent passwd $TEST_USER2 && userdel $TEST_USER2
               sleep 1
         useradd -m -g users $TEST_USER2

testcases/commands/su/su01 rm -f $TEST_ENV_FILE > /dev/null 2>&1 · line 147

Quoted 8 lines
testcases/commands/su/su01 +1 -1
@@ -141,7 +141,7 @@ rm -f $TEST_ENV_FILE > /dev/null 2>&1
         then {
           USER_UID=`id -u $TEST_USER2`
           USER_GID=`id -g $TEST_USER2`
-          mkdir $TEST_USER2_HOMEDIR
+          [ -e $TEST_USER2_HOMEDIR ] || mkdir $TEST_USER2_HOMEDIR
           chown -R $USER_UID.$USER_GID $TEST_USER2_HOMEDIR
               }
               fi

Kind regards,
Petr