From df9f1cd96854c82338c62897d788319b560e43ad Mon Sep 17 00:00:00 2001 From: vmallika Date: Thu, 19 Feb 2015 17:54:03 +0530 Subject: Fix for test usst.t and bug-1167580-set-proper-uid-and-gid-during-nfs-access.t testcase usst.t and bug-1167580-set-proper-uid-and-gid-during-nfs-access.t uses below method to generate random string cat /dev/urandom | tr -dc 'a-zA-Z' | fold -w 8 | head -n 1 Doing a cat on /dev/urandom can consume more CPU usage. Change to: uuidgen | tr -dc 'a-zA-Z' | head -c 8 Change-Id: I9cb562557ae860026fb5e140ed9b5e297b4428d9 BUG: 1163543 Signed-off-by: vmallika Reviewed-on: http://review.gluster.org/9703 Reviewed-by: Niels de Vos Tested-by: Gluster Build System Reviewed-by: Krishnan Parthasarathi Tested-by: Krishnan Parthasarathi --- .../bug-1167580-set-proper-uid-and-gid-during-nfs-access.t | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'tests/bugs') diff --git a/tests/bugs/snapshot/bug-1167580-set-proper-uid-and-gid-during-nfs-access.t b/tests/bugs/snapshot/bug-1167580-set-proper-uid-and-gid-during-nfs-access.t index b15d3a85151..5bea7a71306 100644 --- a/tests/bugs/snapshot/bug-1167580-set-proper-uid-and-gid-during-nfs-access.t +++ b/tests/bugs/snapshot/bug-1167580-set-proper-uid-and-gid-during-nfs-access.t @@ -38,12 +38,11 @@ function check_if_permitted () { # Create a directory in /tmp to specify which directory to make # as home directory for user -home_dir=$(cat /dev/urandom | tr -dc 'a-zA-Z' | fold -w 8 | head -n 1) -home_dir="/tmp/bug-1167580-$home_dir" -mkdir $home_dir +home_dir=$(mktemp -d) +chmod 777 $home_dir function get_new_user() { - local temp=$(cat /dev/urandom | tr -dc 'a-zA-Z' | fold -w 8 | head -n 1) + local temp=$(uuidgen | tr -dc 'a-zA-Z' | head -c 8) id $temp if [ "$?" == "0" ] then @@ -59,9 +58,9 @@ function create_user() { if [ "$group" == "" ] then - useradd -d $home_dir/$user $user + /usr/sbin/useradd -d $home_dir/$user $user else - useradd -d $home_dir/$user -G $group $user + /usr/sbin/useradd -d $home_dir/$user -G $group $user fi return $? -- cgit