--- tests/rats_install/install.py | 29 +++++++++++++++-------------- 1 files changed, 15 insertions(+), 14 deletions(-) diff --git a/tests/rats_install/install.py b/tests/rats_install/install.py index 9814ae2..855da5e 100755 --- a/tests/rats_install/install.py +++ b/tests/rats_install/install.py @@ -26,6 +26,7 @@ import sys import gzip import time import ConfigParser +import re from subprocess import * from minimon import MinimonServer from autoqa import rats, util, config @@ -236,21 +237,21 @@ def watch_for_step(guest, stepname, max_wait=600, serial_logfd=None, if newsize > size: f = open(anaconda_log) for line in f: - # keep track of what step we're on - if " : " not in line: + # Sample match '# 16:48:48,069 INFO anaconda: moving (1) to step postselection' + result = re.match("^([\d:,]+) [A-Z]+ .*:.* moving .* to step ([^ ]+)", line.strip()) + if result is None: continue - (stamp, msg) = line.split(" : ", 1) - if msg.startswith("moving") and "to step " in msg: - (dummy, step) = msg.rsplit(" ", 1) - step = step.strip() - if step not in guest.steplist: - print " anaconda now in step %s" % step - guest.steplist.append(step) - if return_at_start and step == stepname: - return True - elif len(guest.steplist) > 1 and \ - guest.steplist[-2] == stepname: - return True + + # keep track of what step we're on + (stamp, step) = result.groups() + if step not in guest.steplist: + print " anaconda now in step %s" % step + guest.steplist.append(step) + if return_at_start and step == stepname: + return True + elif len(guest.steplist) > 1 and \ + guest.steplist[-2] == stepname: + return True f.close() size = newsize print "%u seconds elapsed - giving up." % max_wait -- 1.6.6

--- tests/rats_install/install.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tests/rats_install/install.py b/tests/rats_install/install.py index 855da5e..a6d7394 100755 --- a/tests/rats_install/install.py +++ b/tests/rats_install/install.py @@ -206,7 +206,7 @@ def watch_for_step(guest, stepname, max_wait=600, serial_logfd=None, return_at_start=False): logdir = guest.minimon.logdir anaconda_log = os.path.join(logdir, "anaconda.log") - dumplog = os.path.join(logdir, "anacdump.log") + dumplog = os.path.join(logdir, "anacdump.txt") size = 0 # For tracking changes to anaconda.log start = time.time() while (time.time() - start) < max_wait: -- 1.6.6