From 88dc9d88990d75637b144ca11d3510c8fb7e3f0b Mon Sep 17 00:00:00 2001 From: Krutika Dhananjay Date: Tue, 26 Nov 2013 13:48:06 +0530 Subject: tests: Change 'volume create' to 'volume create force' Using 'force' when creating volumes prevents errors when creating bricks in the root partition. This fixes test bug-823081.t for bug-962226 Change-Id: I210ffda6bdc2cced4bd54755a2b44fdfd05b813b Original-author: John Smith BUG: 962226 Signed-off-by: John Smith Signed-off-by: Krutika Dhananjay Reviewed-on: http://review.gluster.org/6356 Tested-by: Gluster Build System Reviewed-by: Anand Avati --- tests/bugs/bug-823081.t | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/tests/bugs/bug-823081.t b/tests/bugs/bug-823081.t index ce7d2e509..760d9e2b6 100755 --- a/tests/bugs/bug-823081.t +++ b/tests/bugs/bug-823081.t @@ -14,6 +14,8 @@ function set_tail () vol=$1; tail_success="volume create $vol $H0:$B0/${vol}1 $H0:$B0/${vol}2 : SUCCESS" tail_failure="volume create $vol $H0:$B0/${vol}1 $H0:$B0/${vol}2 : FAILED : Volume $vol already exists" + tail_success_force="volume create $vol $H0:$B0/${vol}1 $H0:$B0/${vol}2 force : SUCCESS" + tail_failure_force="volume create $vol $H0:$B0/${vol}1 $H0:$B0/${vol}2 force : FAILED : Volume $vol already exists" } set_tail $V0; @@ -27,12 +29,12 @@ tail=`tail --lines=1 $logdir/.cmd_log_history | cut -d " " -f 5-` TEST [[ \"$tail\" == \"$tail_failure\" ]] set_tail $V1; -TEST gluster volume create $V1 $H0:$B0/${V1}{1,2}; +TEST gluster volume create $V1 $H0:$B0/${V1}{1,2} force; tail=`tail --lines=1 $logdir/.cmd_log_history | cut -d " " -f 5-` -TEST [[ \"$tail\" == \"$tail_success\" ]] +TEST [[ \"$tail\" == \"$tail_success_force\" ]] -TEST ! gluster volume create $V1 $H0:$B0/${V1}{1,2}; +TEST ! gluster volume create $V1 $H0:$B0/${V1}{1,2} force; tail=`tail --lines=1 $logdir/.cmd_log_history | cut -d " " -f 5-` -TEST [[ \"$tail\" == \"$tail_failure\" ]] +TEST [[ \"$tail\" == \"$tail_failure_force\" ]] cleanup; -- cgit