scottk/wlan-lanforge-scripts
1
0
Fork 0
mirror of https://github.com/Telecominfraproject/wlan-lanforge-scripts.git synced 2025-11-03 12:18:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

cv-test-mgr: Clean up error checking a bit.

Browse Source 
Signed-off-by: Ben Greear <greearb@candelatech.com>
This commit is contained in:
Ben Greear
2021-05-03 17:30:12 -07:00
parent bd6d3149fb
commit 378beafe32
1 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
py-json/cv_test_manager.py
View File

@@ -284,10 +284,11 @@ class cv_test(Realm):
start_try = 0 start_try = 0
while (True): while (True):
response = self.create_test(test_name, instance_name, load_old) response = self.create_test(test_name, instance_name, load_old)
d1 = {k: v for e in response for (k, v) in e.items()} if response[0]["LAST"]["response"] == "OK":
if d1["LAST"]["response"] == "OK":
break break
else: else:
print("Could not create test, try: %i/60:\n"%(start_try))
pprint(response)
start_try += 1 start_try += 1
if start_try > 60: if start_try > 60:
print("ERROR: Could not start within 60 tries, aborting.") print("ERROR: Could not start within 60 tries, aborting.")
@@ -307,9 +308,8 @@ class cv_test(Realm):
self.run_cv_cmd(cmd) self.run_cv_cmd(cmd)
response = self.start_test(instance_name) response = self.start_test(instance_name)
d1 = {k: v for e in response for (k, v) in e.items()} if response[0]["LAST"]["response"].__contains__("Could not find instance:"):
if d1["LAST"]["response"].__contains__("Could not find instance:"): print("ERROR: start_test failed: ", response[0]["LAST"]["response"], "\n");
print("ERROR: start_test failed: ", d1["LAST"]["response"], "\n");
# pprint(response) # pprint(response)
exit(1) exit(1)
@@ -460,6 +460,5 @@ class cv_test(Realm):
rsp = self.json_post(req_url, data, debug_=False, response_json_list_=response_json) rsp = self.json_post(req_url, data, debug_=False, response_json_list_=response_json)
return response_json return response_json
def check_reponse(self, response): def get_response_string(self, response):
d1 = {k: v for e in response for (k, v) in e.items()} return response[0]["LAST"]["response"]
return d1["LAST"]["response"]