diff -r d420eba6f3a0 -r fdf44dc5eff3 sbsv2/raptor/test/smoke_suite/timeout.py --- a/sbsv2/raptor/test/smoke_suite/timeout.py Thu Mar 25 17:00:05 2010 +0000 +++ b/sbsv2/raptor/test/smoke_suite/timeout.py Fri Mar 26 15:47:26 2010 +0000 @@ -29,7 +29,7 @@ t.command = "sbs -b smoke_suite/test_resources/timeout/bld.inf -f-" t.mustmatch = [ - "status exit='failed' code='" + exitCode + "' attempt='1' *reason='timeout'", + "status exit='failed' code='" + exitCode + "' attempt='1' reason='timeout'", ] t.errors = -1 t.returncode = 1 @@ -40,10 +40,10 @@ t.usebash = True t.command = "sbs -b smoke_suite/test_resources/timeout/bld.inf -t 3 -f-" - t.mustmatch = [ - "status exit='retry' code='" + exitCode + "' attempt='1' *reason='timeout'", - "status exit='retry' code='" + exitCode + "' attempt='2' *reason='timeout'", - "status exit='failed' code='" + exitCode + "' attempt='3' *reason='timeout'", + t.mustmatch_singleline = [ + "status exit='retry' code='" + exitCode + "' attempt='1' reason='timeout'", + "status exit='retry' code='" + exitCode + "' attempt='2' reason='timeout'", + "status exit='failed' code='" + exitCode + "' attempt='3' reason='timeout'", ] t.errors = -1 t.returncode = 1