diff options
| author | jadmanski <jadmanski@592f7852-d20e-0410-864c-8624ca9c26a4> | 2008-11-17 16:11:33 +0000 |
|---|---|---|
| committer | jadmanski <jadmanski@592f7852-d20e-0410-864c-8624ca9c26a4> | 2008-11-17 16:11:33 +0000 |
| commit | 4d8ef4980fa8615d89d0fd35ff3da594512c7750 (patch) | |
| tree | bdc41aee9d5b39ea0abb29324d99433fd9d4d366 /tko/parsers | |
| parent | 68919226efb71840d8faa5975712d676994cc144 (diff) | |
We have a silly assertion in the parser that doesn't really matter
anymore; the keyval is the easiest place to find hostnames, but
for multimachine jobs it's not always going to give us an
unambiguous result. That's okay though, it's easy enough to find
the hostname from the individual machine directories.
Risk: Low
Visibility: We can parse multi-machine jobs.
Signed-off-by: John Admanski <jadmanski@google.com>
git-svn-id: svn://test.kernel.org/autotest/trunk@2425 592f7852-d20e-0410-864c-8624ca9c26a4
Diffstat (limited to 'tko/parsers')
| -rw-r--r-- | tko/parsers/version_0.py | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/tko/parsers/version_0.py b/tko/parsers/version_0.py index 57cd1362..5443d6bf 100644 --- a/tko/parsers/version_0.py +++ b/tko/parsers/version_0.py @@ -19,8 +19,8 @@ class job(models.job): user = keyval.get("user", None) label = keyval.get("label", None) machine = keyval.get("hostname", None) - if machine: - assert "," not in machine + if machine and "," in machine: + machine = job.find_hostname(dir) # find a unique hostname queued_time = tko_utils.get_timestamp(keyval, "job_queued") started_time = tko_utils.get_timestamp(keyval, "job_started") finished_time = tko_utils.get_timestamp(keyval, "job_finished") @@ -29,8 +29,6 @@ class job(models.job): aborted_by = keyval.get("aborted_by", None) aborted_at = tko_utils.get_timestamp(keyval, "aborted_on") - if not machine: - machine = job.find_hostname(dir) tko_utils.dprint("MACHINE NAME: %s" % machine) return {"user": user, "label": label, "machine": machine, |