Skip to content

Commit

Permalink
MB-100: use master as argument
Browse files Browse the repository at this point in the history
Change-Id: Id4bc331a00f4a243f2fa6e0eae15ab59cffa6e9a
Reviewed-on: http://review.couchbase.org/17396
Tested-by: buildbot <build@couchbase.com>
Reviewed-by: Steve Yen <steve.yen@gmail.com>
Reviewed-by: Ronnie Sun <ronnie@couchbase.com>
  • Loading branch information
pavel-paulau committed Jun 19, 2012
1 parent d44faee commit 0c4cb6e
Showing 1 changed file with 7 additions and 7 deletions.
14 changes: 7 additions & 7 deletions pytests/performance/perf.py
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,11 @@ def setUpBase0(self):
self.sc = None
if self.parami("tear_down_on_setup", PerfDefaults.tear_down_on_setup) == 1:
self.tearDown() # Tear down in case previous run had unclean death.
self.setUpRest()
master = self.input.servers[0]
self.setUpRest(master)

def setUpRest(self):
self.rest = RestConnection(self.input.servers[0])
def setUpRest(self, master):
self.rest = RestConnection(master)
self.rest_helper = RestHelper(self.rest)

def setUpBase1(self):
Expand All @@ -61,7 +62,8 @@ def setUp(self):
#
self.num_items_loaded = 0

self.setUpCluster()
master = self.input.servers[0]
self.setUpCluster(master)

# Rebalance
num_nodes = self.parami("num_nodes", 10)
Expand All @@ -84,11 +86,9 @@ def setUp(self):
self.wait_until_warmed_up()
ClusterOperationHelper.flush_os_caches(self.input.servers)

def setUpCluster(self):
def setUpCluster(self, master):
print "[perf.setUpCluster] Setting up cluster"

master = self.input.servers[0]

self.rest.init_cluster(master.rest_username, master.rest_password)
self.rest.init_cluster_memoryQuota(master.rest_username,
master.rest_password,
Expand Down

0 comments on commit 0c4cb6e

Please sign in to comment.