From 5a6feec6c89aa657ad9d2568379da6d71d4433c3 Mon Sep 17 00:00:00 2001 From: Anatoly Burakov Date: Fri, 27 Jul 2018 10:40:12 +0100 Subject: [PATCH] test: fix code on report There are no reports defined for any test, so this codepath was never triggered, but it's still wrong because it's referencing variables that aren't there. Fix it by passing target into the test function, and reference correct log variable. Fixes: e2cc79b75d9f ("app: rework autotest.py") Cc: stable@dpdk.org Signed-off-by: Anatoly Burakov --- test/test/autotest_runner.py | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/test/test/autotest_runner.py b/test/test/autotest_runner.py index b09b578763..bdc32da5d4 100644 --- a/test/test/autotest_runner.py +++ b/test/test/autotest_runner.py @@ -41,7 +41,7 @@ def wait_prompt(child): # quite a bit of effort to make it work). -def run_test_group(cmdline, test_group): +def run_test_group(cmdline, target, test_group): results = [] child = None start_time = time.time() @@ -128,14 +128,15 @@ def run_test_group(cmdline, test_group): # make a note when the test was finished end_time = time.time() + log = logfile.getvalue() + # append test data to the result tuple - result += (test["Name"], end_time - start_time, - logfile.getvalue()) + result += (test["Name"], end_time - start_time, log) # call report function, if any defined, and supply it with # target and complete log for test run if test["Report"]: - report = test["Report"](self.target, log) + report = test["Report"](target, log) # append report to results tuple result += (report,) @@ -343,6 +344,7 @@ class AutotestRunner: for test_group in self.parallel_test_groups: result = pool.apply_async(run_test_group, [self.__get_cmdline(test_group), + self.target, test_group]) results.append(result) @@ -367,7 +369,7 @@ class AutotestRunner: # run non_parallel tests. they are run one by one, synchronously for test_group in self.non_parallel_test_groups: group_result = run_test_group( - self.__get_cmdline(test_group), test_group) + self.__get_cmdline(test_group), self.target, test_group) self.__process_results(group_result) -- 2.20.1