diff options
| author | vmallika <vmallika@redhat.com> | 2015-02-19 17:54:03 +0530 |
|---|---|---|
| committer | Krishnan Parthasarathi <kparthas@redhat.com> | 2015-02-20 04:08:37 -0800 |
| commit | df9f1cd96854c82338c62897d788319b560e43ad (patch) | |
| tree | 5cfb32c9bae36b9acbb19058656c33c479b88093 | |
| parent | 9d842f965655bf70c643b4541844e83bc4e74190 (diff) | |
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 <vmallika@redhat.com>
Reviewed-on: http://review.gluster.org/9703
Reviewed-by: Niels de Vos <ndevos@redhat.com>
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Krishnan Parthasarathi <kparthas@redhat.com>
Tested-by: Krishnan Parthasarathi <kparthas@redhat.com>
| -rw-r--r-- | tests/basic/uss.t | 2 | ||||
| -rw-r--r-- | tests/bugs/snapshot/bug-1167580-set-proper-uid-and-gid-during-nfs-access.t | 11 |
2 files changed, 6 insertions, 7 deletions
diff --git a/tests/basic/uss.t b/tests/basic/uss.t index 2e4286860cf..2de66a97f48 100644 --- a/tests/basic/uss.t +++ b/tests/basic/uss.t @@ -65,7 +65,7 @@ TEST $CLI snapshot create snap4 $V0; ## Test that features.uss takes only options enable/disable and throw error for ## any other argument. for i in {1..10}; do - RANDOM_STRING=`cat /dev/urandom | tr -dc 'a-zA-Z' | fold -w 8 | head -n 1` + RANDOM_STRING=$(uuidgen | tr -dc 'a-zA-Z' | head -c 8) TEST_IN_LOOP ! $CLI volume set $V0 features.uss $RANDOM_STRING done 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 $? |