##// END OF EJS Templates
test-run-tests: pad the failure test to preserve the run order...
Matt Harbison -
r28316:c0cecc15 default
parent child Browse files
Show More
@@ -66,6 +66,8 b' failing test'
66 > rataxes
66 > rataxes
67 > This is a noop statement so that
67 > This is a noop statement so that
68 > this test is still more bytes than success.
68 > this test is still more bytes than success.
69 > pad pad pad pad............................................................
70 > pad pad pad pad............................................................
69 > EOF
71 > EOF
70
72
71 >>> fh = open('test-failure-unicode.t', 'wb')
73 >>> fh = open('test-failure-unicode.t', 'wb')
@@ -76,12 +78,13 b' failing test'
76
78
77 --- $TESTTMP/test-failure.t
79 --- $TESTTMP/test-failure.t
78 +++ $TESTTMP/test-failure.t.err
80 +++ $TESTTMP/test-failure.t.err
79 @@ -1,4 +1,4 @@
81 @@ -1,5 +1,5 @@
80 $ echo babar
82 $ echo babar
81 - rataxes
83 - rataxes
82 + babar
84 + babar
83 This is a noop statement so that
85 This is a noop statement so that
84 this test is still more bytes than success.
86 this test is still more bytes than success.
87 pad pad pad pad............................................................
85
88
86 ERROR: test-failure.t output changed
89 ERROR: test-failure.t output changed
87 !.
90 !.
@@ -105,12 +108,13 b' test --xunit support'
105
108
106 --- $TESTTMP/test-failure.t
109 --- $TESTTMP/test-failure.t
107 +++ $TESTTMP/test-failure.t.err
110 +++ $TESTTMP/test-failure.t.err
108 @@ -1,4 +1,4 @@
111 @@ -1,5 +1,5 @@
109 $ echo babar
112 $ echo babar
110 - rataxes
113 - rataxes
111 + babar
114 + babar
112 This is a noop statement so that
115 This is a noop statement so that
113 this test is still more bytes than success.
116 this test is still more bytes than success.
117 pad pad pad pad............................................................
114
118
115 ERROR: test-failure.t output changed
119 ERROR: test-failure.t output changed
116 !.
120 !.
@@ -143,12 +147,13 b' test --xunit support'
143 <testcase name="test-failure.t" time="*"> (glob)
147 <testcase name="test-failure.t" time="*"> (glob)
144 <![CDATA[--- $TESTTMP/test-failure.t
148 <![CDATA[--- $TESTTMP/test-failure.t
145 +++ $TESTTMP/test-failure.t.err
149 +++ $TESTTMP/test-failure.t.err
146 @@ -1,4 +1,4 @@
150 @@ -1,5 +1,5 @@
147 $ echo babar
151 $ echo babar
148 - rataxes
152 - rataxes
149 + babar
153 + babar
150 This is a noop statement so that
154 This is a noop statement so that
151 this test is still more bytes than success.
155 this test is still more bytes than success.
156 pad pad pad pad............................................................
152 ]]> </testcase>
157 ]]> </testcase>
153 </testsuite>
158 </testsuite>
154
159
@@ -161,12 +166,13 b' test for --retest'
161
166
162 --- $TESTTMP/test-failure.t
167 --- $TESTTMP/test-failure.t
163 +++ $TESTTMP/test-failure.t.err
168 +++ $TESTTMP/test-failure.t.err
164 @@ -1,4 +1,4 @@
169 @@ -1,5 +1,5 @@
165 $ echo babar
170 $ echo babar
166 - rataxes
171 - rataxes
167 + babar
172 + babar
168 This is a noop statement so that
173 This is a noop statement so that
169 this test is still more bytes than success.
174 this test is still more bytes than success.
175 pad pad pad pad............................................................
170
176
171 ERROR: test-failure.t output changed
177 ERROR: test-failure.t output changed
172 !
178 !
@@ -195,12 +201,13 b' failed'
195
201
196 --- $TESTTMP/test-failure.t
202 --- $TESTTMP/test-failure.t
197 +++ $TESTTMP/test-failure.t.err
203 +++ $TESTTMP/test-failure.t.err
198 @@ -1,4 +1,4 @@
204 @@ -1,5 +1,5 @@
199 $ echo babar
205 $ echo babar
200 - rataxes
206 - rataxes
201 + babar
207 + babar
202 This is a noop statement so that
208 This is a noop statement so that
203 this test is still more bytes than success.
209 this test is still more bytes than success.
210 pad pad pad pad............................................................
204
211
205 ERROR: test-failure.t output changed
212 ERROR: test-failure.t output changed
206 !
213 !
@@ -214,12 +221,13 b' failure w/ keyword'
214
221
215 --- $TESTTMP/test-failure.t
222 --- $TESTTMP/test-failure.t
216 +++ $TESTTMP/test-failure.t.err
223 +++ $TESTTMP/test-failure.t.err
217 @@ -1,4 +1,4 @@
224 @@ -1,5 +1,5 @@
218 $ echo babar
225 $ echo babar
219 - rataxes
226 - rataxes
220 + babar
227 + babar
221 This is a noop statement so that
228 This is a noop statement so that
222 this test is still more bytes than success.
229 this test is still more bytes than success.
230 pad pad pad pad............................................................
223
231
224 ERROR: test-failure.t output changed
232 ERROR: test-failure.t output changed
225 !
233 !
@@ -266,8 +274,8 b' Running In Debug Mode'
266 *SALT* 0 0 (glob)
274 *SALT* 0 0 (glob)
267 + echo babar
275 + echo babar
268 babar
276 babar
269 + echo *SALT* 4 0 (glob)
277 + echo *SALT* 6 0 (glob)
270 *SALT* 4 0 (glob)
278 *SALT* 6 0 (glob)
271 *+ echo *SALT* 0 0 (glob)
279 *+ echo *SALT* 0 0 (glob)
272 *SALT* 0 0 (glob)
280 *SALT* 0 0 (glob)
273 + echo babar
281 + echo babar
@@ -303,12 +311,13 b' failures in parallel with --first should'
303
311
304 --- $TESTTMP/test-failure*.t (glob)
312 --- $TESTTMP/test-failure*.t (glob)
305 +++ $TESTTMP/test-failure*.t.err (glob)
313 +++ $TESTTMP/test-failure*.t.err (glob)
306 @@ -1,4 +1,4 @@
314 @@ -1,5 +1,5 @@
307 $ echo babar
315 $ echo babar
308 - rataxes
316 - rataxes
309 + babar
317 + babar
310 This is a noop statement so that
318 This is a noop statement so that
311 this test is still more bytes than success.
319 this test is still more bytes than success.
320 pad pad pad pad............................................................
312
321
313 Failed test-failure*.t: output changed (glob)
322 Failed test-failure*.t: output changed (glob)
314 Failed test-nothing.t: output changed
323 Failed test-nothing.t: output changed
@@ -333,12 +342,13 b' Refuse the fix'
333
342
334 --- $TESTTMP/test-failure.t
343 --- $TESTTMP/test-failure.t
335 +++ $TESTTMP/test-failure.t.err
344 +++ $TESTTMP/test-failure.t.err
336 @@ -1,4 +1,4 @@
345 @@ -1,5 +1,5 @@
337 $ echo babar
346 $ echo babar
338 - rataxes
347 - rataxes
339 + babar
348 + babar
340 This is a noop statement so that
349 This is a noop statement so that
341 this test is still more bytes than success.
350 this test is still more bytes than success.
351 pad pad pad pad............................................................
342 Accept this change? [n]
352 Accept this change? [n]
343 ERROR: test-failure.t output changed
353 ERROR: test-failure.t output changed
344 !.
354 !.
@@ -352,6 +362,8 b' Refuse the fix'
352 rataxes
362 rataxes
353 This is a noop statement so that
363 This is a noop statement so that
354 this test is still more bytes than success.
364 this test is still more bytes than success.
365 pad pad pad pad............................................................
366 pad pad pad pad............................................................
355
367
356 Interactive with custom view
368 Interactive with custom view
357
369
@@ -389,12 +401,14 b' Accept the fix'
389
401
390 --- $TESTTMP/test-failure.t
402 --- $TESTTMP/test-failure.t
391 +++ $TESTTMP/test-failure.t.err
403 +++ $TESTTMP/test-failure.t.err
392 @@ -1,9 +1,9 @@
404 @@ -1,11 +1,11 @@
393 $ echo babar
405 $ echo babar
394 - rataxes
406 - rataxes
395 + babar
407 + babar
396 This is a noop statement so that
408 This is a noop statement so that
397 this test is still more bytes than success.
409 this test is still more bytes than success.
410 pad pad pad pad............................................................
411 pad pad pad pad............................................................
398 $ echo 'saved backup bundle to $TESTTMP/foo.hg'
412 $ echo 'saved backup bundle to $TESTTMP/foo.hg'
399 - saved backup bundle to $TESTTMP/foo.hg
413 - saved backup bundle to $TESTTMP/foo.hg
400 + saved backup bundle to $TESTTMP/foo.hg* (glob)
414 + saved backup bundle to $TESTTMP/foo.hg* (glob)
@@ -409,6 +423,8 b' Accept the fix'
409 babar
423 babar
410 This is a noop statement so that
424 This is a noop statement so that
411 this test is still more bytes than success.
425 this test is still more bytes than success.
426 pad pad pad pad............................................................
427 pad pad pad pad............................................................
412 $ echo 'saved backup bundle to $TESTTMP/foo.hg'
428 $ echo 'saved backup bundle to $TESTTMP/foo.hg'
413 saved backup bundle to $TESTTMP/foo.hg (glob)<
429 saved backup bundle to $TESTTMP/foo.hg (glob)<
414 $ echo 'saved backup bundle to $TESTTMP/foo.hg'
430 $ echo 'saved backup bundle to $TESTTMP/foo.hg'
@@ -537,12 +553,13 b' test for --json'
537
553
538 --- $TESTTMP/test-failure.t
554 --- $TESTTMP/test-failure.t
539 +++ $TESTTMP/test-failure.t.err
555 +++ $TESTTMP/test-failure.t.err
540 @@ -1,4 +1,4 @@
556 @@ -1,5 +1,5 @@
541 $ echo babar
557 $ echo babar
542 - rataxes
558 - rataxes
543 + babar
559 + babar
544 This is a noop statement so that
560 This is a noop statement so that
545 this test is still more bytes than success.
561 this test is still more bytes than success.
562 pad pad pad pad............................................................
546
563
547 ERROR: test-failure.t output changed
564 ERROR: test-failure.t output changed
548 !.s
565 !.s
@@ -590,12 +607,13 b' Test that failed test accepted through i'
590
607
591 --- $TESTTMP/test-failure.t
608 --- $TESTTMP/test-failure.t
592 +++ $TESTTMP/test-failure.t.err
609 +++ $TESTTMP/test-failure.t.err
593 @@ -1,4 +1,4 @@
610 @@ -1,5 +1,5 @@
594 $ echo babar
611 $ echo babar
595 - rataxes
612 - rataxes
596 + babar
613 + babar
597 This is a noop statement so that
614 This is a noop statement so that
598 this test is still more bytes than success.
615 this test is still more bytes than success.
616 pad pad pad pad............................................................
599 Accept this change? [n] ..s
617 Accept this change? [n] ..s
600 Skipped test-skip.t: missing feature: nail clipper
618 Skipped test-skip.t: missing feature: nail clipper
601 # Ran 2 tests, 1 skipped, 0 warned, 0 failed.
619 # Ran 2 tests, 1 skipped, 0 warned, 0 failed.
General Comments 0
You need to be logged in to leave comments. Login now