From d7a033d9e40eedee5e0413cb2f0898fc82364f58 Mon Sep 17 00:00:00 2001 From: opensource-tnbt Date: Tue, 1 Dec 2020 16:46:31 +0530 Subject: Tools: Improve Stability. This patch has minor updates to improve stability. Signed-off-by: Sridhar K. N. Rao Change-Id: I0ded30c64389d75f15d2a8758a40dfb5cf3ff674 --- tools/pkt_gen/testcenter/testcenter-rfc2544-rest.py | 6 ++++++ tools/pkt_gen/testcenter/testcenter.py | 2 ++ 2 files changed, 8 insertions(+) (limited to 'tools/pkt_gen/testcenter') diff --git a/tools/pkt_gen/testcenter/testcenter-rfc2544-rest.py b/tools/pkt_gen/testcenter/testcenter-rfc2544-rest.py index 2f0cb0b4..8089ef42 100644 --- a/tools/pkt_gen/testcenter/testcenter-rfc2544-rest.py +++ b/tools/pkt_gen/testcenter/testcenter-rfc2544-rest.py @@ -691,6 +691,11 @@ def main(): lab_server_resultsdb = stc.get( "system1.project.TestResultSetting", "CurrentResultFileName") + if not lab_server_resultsdb or 'Results' not in lab_server_resultsdb: + _LOGGER.info("Failed to find results.") + stc.end_session() + return + if args.verbose: _LOGGER.debug("The lab server results database is %s", lab_server_resultsdb) @@ -811,6 +816,7 @@ def main(): args.results_dir, args.csv_results_file_prefix, resultsdict) except RuntimeError as e: + stc.end_session() _LOGGER.error(e) if args.verbose: diff --git a/tools/pkt_gen/testcenter/testcenter.py b/tools/pkt_gen/testcenter/testcenter.py index 73967bae..a15c502c 100644 --- a/tools/pkt_gen/testcenter/testcenter.py +++ b/tools/pkt_gen/testcenter/testcenter.py @@ -338,6 +338,8 @@ class TestCenter(trafficgen.ITrafficGenerator): Reads the CSV file and return the results """ result = {} + if not os.path.exists(filename): + return result with open(filename, "r") as csvfile: csvreader = csv.DictReader(csvfile) for row in csvreader: -- cgit 1.2.3-korg