##// END OF EJS Templates
run-tests: defer leftover (?) cleanup until after all output is exhausted...
Matt Harbison -
r28317:8de70574 default
parent child Browse files
Show More
@@ -1138,14 +1138,13 b' class TTest(Test):'
1138 elif warnonly == 1: # Is "not yet" and line is warn only.
1138 elif warnonly == 1: # Is "not yet" and line is warn only.
1139 warnonly = 2 # Yes do warn.
1139 warnonly = 2 # Yes do warn.
1140 break
1140 break
1141
1141 else:
1142 # clean up any optional leftovers
1142 # clean up any optional leftovers
1143 while expected.get(pos, None):
1143 while expected.get(pos, None):
1144 el = expected[pos].pop(0)
1144 el = expected[pos].pop(0)
1145 if not el.endswith(b" (?)\n"):
1145 if el and not el.endswith(b" (?)\n"):
1146 expected[pos].insert(0, el)
1146 break
1147 break
1147 postout.append(b' ' + el)
1148 postout.append(b' ' + el)
1149
1148
1150 if lcmd:
1149 if lcmd:
1151 # Add on last return code.
1150 # Add on last return code.
@@ -52,6 +52,12 b' a succesful test'
52 > never happens (?)
52 > never happens (?)
53 > xyzzy
53 > xyzzy
54 > nor this (?)
54 > nor this (?)
55 > $ printf 'abc\ndef\nxyz\n'
56 > 123 (?)
57 > abc
58 > def (?)
59 > 456 (?)
60 > xyz
55 > EOF
61 > EOF
56
62
57 $ rt
63 $ rt
@@ -286,6 +292,12 b' Running In Debug Mode'
286 xyzzy
292 xyzzy
287 + echo *SALT* 6 0 (glob)
293 + echo *SALT* 6 0 (glob)
288 *SALT* 6 0 (glob)
294 *SALT* 6 0 (glob)
295 + printf *abc\ndef\nxyz\n* (glob)
296 abc
297 def
298 xyz
299 + echo *SALT* 12 0 (glob)
300 *SALT* 12 0 (glob)
289 .
301 .
290 # Ran 2 tests, 0 skipped, 0 warned, 0 failed.
302 # Ran 2 tests, 0 skipped, 0 warned, 0 failed.
291
303
General Comments 0
You need to be logged in to leave comments. Login now