Merge "Cleanup test_over_quota"
This commit is contained in:
commit
7928446821
|
@ -655,7 +655,7 @@ class NodeRequestHandler(NodeRequestHandlerNotifications,
|
||||||
|
|
||||||
# Launches are complete, so populate ready_nodes and failed_nodes.
|
# Launches are complete, so populate ready_nodes and failed_nodes.
|
||||||
aborted_nodes = []
|
aborted_nodes = []
|
||||||
for node in self.nodeset[:]:
|
for node in self.nodeset.copy():
|
||||||
if node.state == zk.READY:
|
if node.state == zk.READY:
|
||||||
self.ready_nodes.append(node)
|
self.ready_nodes.append(node)
|
||||||
elif node.state == zk.ABORTED:
|
elif node.state == zk.ABORTED:
|
||||||
|
|
|
@ -306,9 +306,7 @@ class TestLauncher(tests.DBTestCase):
|
||||||
|
|
||||||
pool_worker = pool.getPoolWorkers('fake-provider')
|
pool_worker = pool.getPoolWorkers('fake-provider')
|
||||||
while not pool_worker[0].paused_handler:
|
while not pool_worker[0].paused_handler:
|
||||||
# self.log.debug("tick")
|
|
||||||
time.sleep(0.1)
|
time.sleep(0.1)
|
||||||
self.log.debug("finished waiting")
|
|
||||||
|
|
||||||
# The handler is paused now and the request should be in state PENDING
|
# The handler is paused now and the request should be in state PENDING
|
||||||
req2 = self.waitForNodeRequest(req2, zk.PENDING)
|
req2 = self.waitForNodeRequest(req2, zk.PENDING)
|
||||||
|
|
Loading…
Reference in New Issue