stackforge/fuel-ostf-plugin
Code Issues Proposed changes

added ostf client

Browse Source 
added script to find current cluster id
This commit is contained in:
ekonstantinov
2013-08-02 19:29:51 +03:00
parent bdccf1c003
commit f1c7870793
4 changed files with 141 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
functional/client.py
View File

@@ -81,7 +81,7 @@ class TestingAdapterClient(object):
testrun_id = [item['id'] for item in latest if item['testset'] == testset][0]
return self.restart_tests(tests, testrun_id)
def _with_timeout(self, action, testset, cluster_id, timeout):
def _with_timeout(self, action, testset, cluster_id, timeout, polling=5, polling_hook=None):
start_time = time.time()
json = action().json()
@@ -91,16 +91,20 @@ class TestingAdapterClient(object):
action()
while time.time() - start_time <= timeout:
time.sleep(5)
time.sleep(polling)
current_response = self.testruns_last(cluster_id)
if polling_hook:
polling_hook(current_response)
current_status, current_tests = [(item['status'], item['tests']) for item in current_response.json()
if item['testset'] == testset][0]
if current_status == 'finished':
break
else:
self.stop_testrun_last(testset, cluster_id)
stopped_response = self.stop_testrun_last(testset, cluster_id)
if polling_hook:
polling_hook(stopped_response)
stopped_response = self.testruns_last(cluster_id)
stopped_status = [item['status'] for item in stopped_response.json()
if item['testset'] == testset][0]
@@ -110,12 +114,12 @@ class TestingAdapterClient(object):
raise AssertionError('\n'.join([msg, msg_tests]))
return current_response
def run_with_timeout(self, testset, tests, cluster_id, timeout):
def run_with_timeout(self, testset, tests, cluster_id, timeout, polling, polling_hook):
action = lambda: self.start_testrun_tests(testset, tests, cluster_id)
return self._with_timeout(action, testset, cluster_id, timeout)
return self._with_timeout(action, testset, cluster_id, timeout, polling, polling_hook)
def run_testset_with_timeout(self, testset, cluster_id, timeout):
return self.run_with_timeout(testset, [], cluster_id, timeout)
def run_testset_with_timeout(self, testset, cluster_id, timeout, polling=5, polling_hook=None):
return self.run_with_timeout(testset, [], cluster_id, timeout, polling, polling_hook)
def restart_with_timeout(self, testset, tests, cluster_id, timeout):
action = lambda: self.restart_tests_last(testset, tests, cluster_id)

2
functional/scenario.py
View File

@@ -21,7 +21,7 @@ class ScenarioTests(BaseAdapterTest):
@classmethod
def setUpClass(cls):
url = 'http://.0.0.0:8989/v1'
url = 'http://0.0.0.0:8989/v1'
mapping = {}
cls.client = cls.init_client(url, mapping)