summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorAtin Mukherjee <amukherj@redhat.com>2016-12-27 11:17:29 +0530
committerAtin Mukherjee <amukherj@redhat.com>2017-01-01 21:37:35 -0800
commit6b88186c804b05ac05f0613b9ec290e2373d3bbb (patch)
tree0b00fda56f4b638852269c1ba4c45409af5fd03c /tests
parent08056421b886b1ebf1e0eed93d9f6f9b6d017489 (diff)
tests: fix tests/bugs/glusterd/bug-913555.t spurious failures
Mainly replaced EXPECT instances with EXPECT_WITHIN Change-Id: If48f444f6b2ba6713fdc5e31ff3a642092e62ada BUG: 1408758 Signed-off-by: Atin Mukherjee <amukherj@redhat.com> Reviewed-on: http://review.gluster.org/16289 Smoke: Gluster Build System <jenkins@build.gluster.org> NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org> CentOS-regression: Gluster Build System <jenkins@build.gluster.org> Reviewed-by: N Balachandran <nbalacha@redhat.com> Reviewed-by: Raghavendra G <rgowdapp@redhat.com>
Diffstat (limited to 'tests')
-rwxr-xr-xtests/bugs/glusterd/bug-913555.t13
1 files changed, 8 insertions, 5 deletions
diff --git a/tests/bugs/glusterd/bug-913555.t b/tests/bugs/glusterd/bug-913555.t
index 0bc839e316d..5c845dc8545 100755
--- a/tests/bugs/glusterd/bug-913555.t
+++ b/tests/bugs/glusterd/bug-913555.t
@@ -27,20 +27,23 @@ EXPECT_WITHIN $PROBE_TIMEOUT 2 check_peers
TEST $CLI_1 volume create $V0 $H1:$B1/$V0 $H2:$B2/$V0 $H3:$B3/$V0
TEST $CLI_1 volume set $V0 cluster.server-quorum-type server
TEST $CLI_1 volume start $V0
+EXPECT_WITHIN $PROCESS_UP_TIMEOUT 3 online_brick_count;
+
TEST glusterfs --volfile-server=$H1 --volfile-id=$V0 $M0
+EXPECT_WITHIN $PROCESS_UP_TIMEOUT 0 check_fs $M0;
# Kill one pseudo-node, make sure the others survive and volume stays up.
TEST kill_node 3;
EXPECT_WITHIN $PROBE_TIMEOUT 1 check_peers;
-EXPECT 0 check_fs $M0;
-EXPECT 2 online_brick_count;
+EXPECT_WITHIN $PROCESS_UP_TIMEOUT 2 online_brick_count;
+EXPECT_WITHIN $PROCESS_UP_TIMEOUT 0 check_fs $M0;
# Kill another pseudo-node, make sure the last one dies and volume goes down.
TEST kill_node 2;
EXPECT_WITHIN $PROBE_TIMEOUT 0 check_peers
-EXPECT 1 check_fs $M0;
-EXPECT 0 online_brick_count; # the two glusterfsds of the other two glusterds
- # must be dead
+#two glusterfsds of the other two glusterds must be dead
+EXPECT_WITHIN $PROCESS_UP_TIMEOUT 0 online_brick_count;
+EXPECT_WITHIN $PROCESS_UP_TIMEOUT 1 check_fs $M0;
TEST $glusterd_2;
TEST $glusterd_3;