Browse files

CBQE-806: wait warmup in teardown of autofailover tests

wait_for_ns_servers_or_assert with wait warmup in teardown of autofailover tests

Change-Id: I16ef11ddc00ad963403f49a3b611b2b928e1531c
Reviewed-on: http://review.couchbase.org/22612
Reviewed-by: Andrei Baranouski <andrei.baranouski@gmail.com>
Tested-by: buildbot <build@couchbase.com>
  • Loading branch information...
1 parent b55aa9c commit 536e27e3abd7f9033e8f144de402eb85366ae99a @andreibaranouski andreibaranouski committed with andreibaranouski Nov 18, 2012
Showing with 2 additions and 2 deletions.
  1. +2 −2 pytests/autofailovertests.py
View
4 pytests/autofailovertests.py
@@ -41,7 +41,8 @@ def common_tearDown(servers, testcase):
log.info("10 seconds delay to wait for couchbase-server to start")
time.sleep(10)
- ClusterOperationHelper.wait_for_ns_servers_or_assert(servers, testcase)
+ ClusterOperationHelper.wait_for_ns_servers_or_assert(servers, testcase, \
+ wait_time=AutoFailoverBaseTest.MAX_FAIL_DETECT_TIME * 15, wait_if_warmup=True)
try:
rest = RestConnection(self._servers[0])
buckets = rest.get_buckets()
@@ -51,7 +52,6 @@ def common_tearDown(servers, testcase):
pass
BucketOperationHelper.delete_all_buckets_or_assert(servers, testcase)
ClusterOperationHelper.cleanup_cluster(servers)
- ClusterOperationHelper.wait_for_ns_servers_or_assert(servers, testcase)
log.info("============== common_tearDown was finished for test #{0} {1} =============="\
.format(testcase.case_number, testcase._testMethodName))

0 comments on commit 536e27e

Please sign in to comment.