summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorJohn Smith <lbalbalba@gmail.com>2013-05-19 19:57:04 +0200
committerVijay Bellur <vbellur@redhat.com>2013-05-23 07:42:55 -0700
commita387a545b44a553b9aedf1e2f4683c84dee0e6be (patch)
treea8df7d6bf507d2d94a2548c627083aa80ad87c68 /tests
parent323fe9ec806a4a922fc6f3fd2389368811d6b417 (diff)
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: I00996e1ab76713084076507d0aebdb65edc806c8 BUG: 962226 Signed-off-by: John Smith <lbalbalba@gmail.com> Reviewed-on: http://review.gluster.org/5036 Tested-by: Gluster Build System <jenkins@build.gluster.com> Reviewed-by: Krutika Dhananjay <kdhananj@redhat.com>
Diffstat (limited to 'tests')
-rwxr-xr-xtests/bugs/bug-823081.t10
1 files changed, 6 insertions, 4 deletions
diff --git a/tests/bugs/bug-823081.t b/tests/bugs/bug-823081.t
index ce7d2e50..760d9e2b 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;