diff options
| author | Pranith Kumar K <pkarampu@redhat.com> | 2013-03-04 16:23:46 +0530 |
|---|---|---|
| committer | Anand Avati <avati@redhat.com> | 2013-04-02 19:05:36 -0700 |
| commit | b38d98e706724eb80a822f82c3c265d3ea41ff54 (patch) | |
| tree | b338a6f9871902183cabef1c3d3287a2aea6e822 /tests | |
| parent | 6b393b3ab6799ede09f6d2b303e35b8bc505f465 (diff) | |
Tests: Change rebalance status verification
According to the comment at the following URL
https://bugzilla.redhat.com/show_bug.cgi?id=916226#c2
"success:" can come even before rebalance is completed.
Changed it to check for "completed" instead.
Change-Id: Ibe9d3b75493240f30261ac2a1280f32ef32886da
BUG: 916226
Signed-off-by: Pranith Kumar K <pkarampu@redhat.com>
Reviewed-on: http://review.gluster.org/4614
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Anand Avati <avati@redhat.com>
Diffstat (limited to 'tests')
| -rwxr-xr-x | tests/bugs/bug-853258.t | 4 | ||||
| -rw-r--r-- | tests/bugs/bug-916226.t | 2 | ||||
| -rw-r--r-- | tests/volume.rc | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/tests/bugs/bug-853258.t b/tests/bugs/bug-853258.t index c702e6f30ea..79cb88099f2 100755 --- a/tests/bugs/bug-853258.t +++ b/tests/bugs/bug-853258.t @@ -20,7 +20,7 @@ EXPECT_WITHIN 15 'Started' volinfo_field $V0 'Status'; # Force assignment of initial ranges. TEST $CLI volume rebalance $V0 fix-layout start -EXPECT_WITHIN 15 "success:" rebalance_status_field $V0 +EXPECT_WITHIN 15 "completed" rebalance_status_field $V0 # Get the original values. xattrs="" @@ -32,7 +32,7 @@ done TEST $CLI volume add-brick $V0 $H0:$B0/${V0}3 # Force assignment of initial ranges. TEST $CLI volume rebalance $V0 fix-layout start -EXPECT_WITHIN 15 "success:" rebalance_status_field $V0 +EXPECT_WITHIN 15 "completed" rebalance_status_field $V0 for i in $(seq 0 3); do xattrs="$xattrs $(dht_get_layout $B0/${V0}$i)" diff --git a/tests/bugs/bug-916226.t b/tests/bugs/bug-916226.t index 1a4870f2e15..2abfa1fc604 100644 --- a/tests/bugs/bug-916226.t +++ b/tests/bugs/bug-916226.t @@ -21,6 +21,6 @@ TEST touch $M0/dir{1..10}/files{1..10}; TEST $CLI volume add-brick $V0 $H0:$B0/${V0}4 $H0:/$B0/${V0}5 TEST $CLI volume rebalance $V0 start force -EXPECT_WITHIN 60 "success:" rebalance_status_field $V0 +EXPECT_WITHIN 60 "completed" rebalance_status_field $V0 cleanup; diff --git a/tests/volume.rc b/tests/volume.rc index 33a38ee7ee6..5b7a38f77e3 100644 --- a/tests/volume.rc +++ b/tests/volume.rc @@ -27,7 +27,7 @@ function volume_option() } function rebalance_status_field { - $CLI volume rebalance $1 status | sed -n '$p' | cut -d' ' -f4 + $CLI volume rebalance $1 status | awk '{print $6}' | sed -n 3p } function remove_brick_status_completed_field { |