[LTP] [PATCH ltp] su01: do pre-checking to avoid annoying warnings

public inbox for ltp@lists.linux.it
 help / color / mirror / Atom feed

* [LTP] [PATCH ltp] su01: do pre-checking to avoid annoying warnings
@ 2016-12-02  3:03 Han, NingX
  2016-12-02  7:45 ` Petr Vorel
  0 siblings, 1 reply; 6+ messages in thread
From: Han, NingX @ 2016-12-02  3:03 UTC (permalink / raw)
  To: ltp

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 <ningx.han@intel.com>
---
testcases/commands/su/su01 | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/testcases/commands/su/su01 b/testcases/commands/su/su01
index dd1517f..9510f29 100755
--- a/testcases/commands/su/su01
+++ b/testcases/commands/su/su01
@@ -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>

^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [LTP] [PATCH ltp] su01: do pre-checking to avoid annoying warnings
  2016-12-02  3:03 [LTP] [PATCH ltp] su01: do pre-checking to avoid annoying warnings Han, NingX
@ 2016-12-02  7:45 ` Petr Vorel
  2016-12-05  0:56   ` Han Ning
  0 siblings, 1 reply; 6+ messages in thread
From: Petr Vorel @ 2016-12-02  7:45 UTC (permalink / raw)
  To: ltp

Hi,

> 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 <ningx.han@intel.com>
> ---
> testcases/commands/su/su01 | 12 ++++++------
> 1 file changed, 6 insertions(+), 6 deletions(-)

> diff --git a/testcases/commands/su/su01 b/testcases/commands/su/su01
> index dd1517f..9510f29 100755
> --- a/testcases/commands/su/su01
> +++ b/testcases/commands/su/su01
> @@ -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).

> +        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?

>            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


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>

^ permalink raw reply	[flat|nested] 6+ messages in thread

* [LTP] [PATCH ltp] su01: do pre-checking to avoid annoying warnings
  2016-12-02  7:45 ` Petr Vorel
@ 2016-12-05  0:56   ` Han Ning
  0 siblings, 0 replies; 6+ messages in thread
From: Han Ning @ 2016-12-05  0:56 UTC (permalink / raw)
  To: ltp

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

> Hi,
> 
> > 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 <ningx.han@intel.com>
> > ---
> > testcases/commands/su/su01 | 12 ++++++------
> > 1 file changed, 6 insertions(+), 6 deletions(-)
> 
> > diff --git a/testcases/commands/su/su01 b/testcases/commands/su/su01
> > index dd1517f..9510f29 100755
> > --- a/testcases/commands/su/su01
> > +++ b/testcases/commands/su/su01
> > @@ -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.
> 
> > +        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.
> 
> >            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
> 
> 
> Kind regards,
> Petr



^ permalink raw reply	[flat|nested] 6+ messages in thread

* [LTP] [PATCH ltp] su01: do pre-checking to avoid annoying warnings
@ 2016-12-12  0:56 Ning, Han
  2016-12-15 12:12 ` Cyril Hrubis
  0 siblings, 1 reply; 6+ messages in thread
From: Ning, Han @ 2016-12-12  0:56 UTC (permalink / raw)
  To: ltp

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..5e59eff 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 && 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 && 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


^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [LTP] [PATCH ltp] su01: do pre-checking to avoid annoying warnings
  2016-12-12  0:56 Ning, Han
@ 2016-12-15 12:12 ` Cyril Hrubis
  2016-12-16  0:31   ` Han Ning
  0 siblings, 1 reply; 6+ messages in thread
From: Cyril Hrubis @ 2016-12-15 12:12 UTC (permalink / raw)
  To: ltp

Hi!
> -        userdel $TEST_USER1
> +        getent passwd $TEST_USER1 && userdel $TEST_USER1

Shouldn't we redirect the output from getent to /dev/null here?

Otherwise it looks fine.

-- 
Cyril Hrubis
chrubis@suse.cz

^ permalink raw reply	[flat|nested] 6+ messages in thread

* [LTP] [PATCH ltp] su01: do pre-checking to avoid annoying warnings
  2016-12-15 12:12 ` Cyril Hrubis
@ 2016-12-16  0:31   ` Han Ning
  0 siblings, 0 replies; 6+ messages in thread
From: Han Ning @ 2016-12-16  0:31 UTC (permalink / raw)
  To: ltp

On Thu, Dec 15, 2016 at 01:12:37PM +0100, Cyril Hrubis wrote:
> Hi!
> > -        userdel $TEST_USER1
> > +        getent passwd $TEST_USER1 && userdel $TEST_USER1
> 
> Shouldn't we redirect the output from getent to /dev/null here?
Yes, we should. I'll send another patch for this. 

> 
> Otherwise it looks fine.
> 
> -- 
> Cyril Hrubis
> chrubis@suse.cz

^ permalink raw reply	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2016-12-16  0:31 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-12-02  3:03 [LTP] [PATCH ltp] su01: do pre-checking to avoid annoying warnings Han, NingX
2016-12-02  7:45 ` Petr Vorel
2016-12-05  0:56   ` Han Ning
  -- strict thread matches above, loose matches on Subject: below --
2016-12-12  0:56 Ning, Han
2016-12-15 12:12 ` Cyril Hrubis
2016-12-16  0:31   ` Han Ning

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox