public inbox for ltp@lists.linux.it
 help / color / mirror / Atom feed
From: Ning,Han <ningx.han@intel.com>
To: ltp@lists.linux.it
Subject: [LTP] [PATCH ltp] su01: do pre-checking to avoid annoying warning
Date: Fri, 16 Dec 2016 08:53:42 +0800	[thread overview]
Message-ID: <1481849622-19704-1-git-send-email-ningx.han@intel.com> (raw)

From: Ning Han <ningx.han@intel.com>

Signed-off-by: Ning Han <ningx.han@intel.com>
---
 testcases/commands/su/su01 | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/testcases/commands/su/su01 b/testcases/commands/su/su01
index dd1517f..41441de 100755
--- a/testcases/commands/su/su01
+++ b/testcases/commands/su/su01
@@ -86,7 +86,7 @@ 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
+        getent passwd $TEST_USER1 &> /dev/null && 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
+          mkdir -p $TEST_USER1_HOMEDIR
           chown -R $USER_UID.$USER_GID $TEST_USER1_HOMEDIR
 	}
 	fi
@@ -121,7 +121,7 @@ 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
+        getent passwd $TEST_USER2 &> /dev/null && 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
+          mkdir -p $TEST_USER2_HOMEDIR
           chown -R $USER_UID.$USER_GID $TEST_USER2_HOMEDIR
 	}
 	fi
-- 
2.7.4


             reply	other threads:[~2016-12-16  0:53 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-12-16  0:53 Ning, Han [this message]
2017-01-18 10:26 ` [LTP] [PATCH ltp] su01: do pre-checking to avoid annoying warning Cyril Hrubis

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1481849622-19704-1-git-send-email-ningx.han@intel.com \
    --to=ningx.han@intel.com \
    --cc=ltp@lists.linux.it \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox