diff options
| author | jadmanski <jadmanski@592f7852-d20e-0410-864c-8624ca9c26a4> | 2010-05-04 19:50:30 +0000 |
|---|---|---|
| committer | jadmanski <jadmanski@592f7852-d20e-0410-864c-8624ca9c26a4> | 2010-05-04 19:50:30 +0000 |
| commit | da557ffc90dc66874ef90cb01b1528a8a9625773 (patch) | |
| tree | 230461d0cdbd55cf36b02ba77bb5f8d57b5799ec /tko/parsers | |
| parent | e4d04d8a14a6bdc2d9cc5dc155af56a204280bab (diff) | |
Fix the recent CLIENT_JOB changes in the parser to not conflict with
the SERVER_JOB changes, and to properly tie the RUNNING entry to the
final CLIENT_JOB entry.
Signed-off-by: John Admanski <jadmanski@google.com>
git-svn-id: svn://test.kernel.org/autotest/trunk@4464 592f7852-d20e-0410-864c-8624ca9c26a4
Diffstat (limited to 'tko/parsers')
| -rw-r--r-- | tko/parsers/version_1.py | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/tko/parsers/version_1.py b/tko/parsers/version_1.py index 2a238003..e231fd1b 100644 --- a/tko/parsers/version_1.py +++ b/tko/parsers/version_1.py @@ -257,14 +257,14 @@ class parser(base.parser): min_stack_size = stack.size() # start a "RUNNING" CLIENT_JOB entry job_name = "CLIENT_JOB.%d" % job_count - running_job = test.parse_partial_test(self.job, None, - job_name, - "", current_kernel, - started_time) + running_client = test.parse_partial_test(self.job, None, + job_name, + "", current_kernel, + started_time) msg = "RUNNING: %s\n%s\n" - msg %= (running_job.status, running_job.testname) + msg %= (running_client.status, running_client.testname) tko_utils.dprint(msg) - new_tests.append(running_job) + new_tests.append(running_client) elif stack.size() == min_stack_size + 1 and not running_test: # we just started a new test, insert a running record running_reasons = set() @@ -353,6 +353,7 @@ class parser(base.parser): # if there was no testname or subdir, use 'CLIENT_JOB' if line.testname is None: line.testname = "CLIENT_JOB.%d" % job_count + running_test = running_client job_count += 1 if not status_lib.is_worse_than_or_equal_to( current_status, "ABORT"): |