Skip to content

Commit

Permalink
CBQE-2791: rebalance test n1ql fixes
Browse files Browse the repository at this point in the history
Change-Id: I36ac336de23e506d05ba7001ac278a00a2347d56
Reviewed-on: http://review.couchbase.org/50713
Tested-by: buildbot <build@couchbase.com>
Reviewed-by: Iryna Mironava <irynamironava@yandex.ru>
Tested-by: Iryna Mironava <irynamironava@yandex.ru>
  • Loading branch information
IrynaMironava committed May 10, 2015
1 parent 1e9f301 commit 99a9893
Showing 1 changed file with 13 additions and 2 deletions.
15 changes: 13 additions & 2 deletions pytests/tuqquery/tuq_cluster_ops.py
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,17 @@ def tearDown(self):
super(QueriesOpsTests, self).tearDown()
except:
pass
ClusterOperationHelper.cleanup_cluster(self.servers)
self.sleep(10)
try:
ClusterOperationHelper.cleanup_cluster(self.servers, master=self.master)
self.sleep(1)
except:
for server in set(self.servers) - set([self.master]):
try:
rest = RestConnection(server)
rest.force_eject_node()
time.sleep(1)
except BaseException, e:
self.fail(e)


def suite_tearDown(self):
Expand Down Expand Up @@ -218,6 +227,7 @@ def test_warmup(self):
except:
pass
ClusterOperationHelper.wait_for_ns_servers_or_assert(self.servers, self)
self.verify_cluster_stats(self.servers[:self.nodes_init])
self.sleep(5)
self.test_union_all()
finally:
Expand All @@ -230,6 +240,7 @@ def test_with_backup(self):
node = RestConnection(self.master).get_nodes_self()
self.is_membase = False
BackupHelper(self.master, self).backup('default', node, tmp_folder)
self.verify_cluster_stats(self.servers[:self.nodes_init])
self.test_union_all()
finally:
self.shell.delete_files(tmp_folder)
Expand Down

0 comments on commit 99a9893

Please sign in to comment.