##// END OF EJS Templates
test-run-tests.t: add extra data to tests for keyword tests...
Augie Fackler -
r21995:20bfcb48 default
parent child Browse files
Show More
@@ -13,6 +13,8 b' a succesful test'
13 $ cat > test-success.t << EOF
13 $ cat > test-success.t << EOF
14 > $ echo babar
14 > $ echo babar
15 > babar
15 > babar
16 > $ echo xyzzy
17 > xyzzy
16 > EOF
18 > EOF
17
19
18 $ $TESTDIR/run-tests.py --with-hg=`which hg`
20 $ $TESTDIR/run-tests.py --with-hg=`which hg`
@@ -25,16 +27,20 b' failing test'
25 $ cat > test-failure.t << EOF
27 $ cat > test-failure.t << EOF
26 > $ echo babar
28 > $ echo babar
27 > rataxes
29 > rataxes
30 > This is a noop statement so that
31 > this test is still more bytes than success.
28 > EOF
32 > EOF
29
33
30 $ $TESTDIR/run-tests.py --with-hg=`which hg`
34 $ $TESTDIR/run-tests.py --with-hg=`which hg`
31
35
32 --- $TESTTMP/test-failure.t
36 --- $TESTTMP/test-failure.t
33 +++ $TESTTMP/test-failure.t.err
37 +++ $TESTTMP/test-failure.t.err
34 @@ -1,2 +1,2 @@
38 @@ -1,4 +1,4 @@
35 $ echo babar
39 $ echo babar
36 - rataxes
40 - rataxes
37 + babar
41 + babar
42 This is a noop statement so that
43 this test is still more bytes than success.
38
44
39 ERROR: test-failure.t output changed
45 ERROR: test-failure.t output changed
40 !.
46 !.
@@ -50,10 +56,12 b' test for --retest'
50
56
51 --- $TESTTMP/test-failure.t
57 --- $TESTTMP/test-failure.t
52 +++ $TESTTMP/test-failure.t.err
58 +++ $TESTTMP/test-failure.t.err
53 @@ -1,2 +1,2 @@
59 @@ -1,4 +1,4 @@
54 $ echo babar
60 $ echo babar
55 - rataxes
61 - rataxes
56 + babar
62 + babar
63 This is a noop statement so that
64 this test is still more bytes than success.
57
65
58 ERROR: test-failure.t output changed
66 ERROR: test-failure.t output changed
59 !
67 !
@@ -77,10 +85,12 b' failed'
77
85
78 --- $TESTTMP/test-failure.t
86 --- $TESTTMP/test-failure.t
79 +++ $TESTTMP/test-failure.t.err
87 +++ $TESTTMP/test-failure.t.err
80 @@ -1,2 +1,2 @@
88 @@ -1,4 +1,4 @@
81 $ echo babar
89 $ echo babar
82 - rataxes
90 - rataxes
83 + babar
91 + babar
92 This is a noop statement so that
93 this test is still more bytes than success.
84
94
85 ERROR: test-failure.t output changed
95 ERROR: test-failure.t output changed
86 !
96 !
@@ -97,14 +107,18 b' Running In Debug Mode'
97 SALT* 0 0 (glob)
107 SALT* 0 0 (glob)
98 + echo babar
108 + echo babar
99 babar
109 babar
100 + echo SALT* 2 0 (glob)
110 + echo SALT* 4 0 (glob)
101 SALT* 2 0 (glob)
111 SALT* 4 0 (glob)
102 .+ echo SALT* 0 0 (glob)
112 .+ echo SALT* 0 0 (glob)
103 SALT* 0 0 (glob)
113 SALT* 0 0 (glob)
104 + echo babar
114 + echo babar
105 babar
115 babar
106 + echo SALT* 2 0 (glob)
116 + echo SALT* 2 0 (glob)
107 SALT* 2 0 (glob)
117 SALT* 2 0 (glob)
118 + echo xyzzy
119 xyzzy
120 + echo SALT* 4 0 (glob)
121 SALT* 4 0 (glob)
108 .
122 .
109 # Ran 2 tests, 0 skipped, 0 warned, 0 failed.
123 # Ran 2 tests, 0 skipped, 0 warned, 0 failed.
110
124
@@ -118,19 +132,23 b' Parallel runs'
118
132
119 --- $TESTTMP/test-failure*.t (glob)
133 --- $TESTTMP/test-failure*.t (glob)
120 +++ $TESTTMP/test-failure*.t.err (glob)
134 +++ $TESTTMP/test-failure*.t.err (glob)
121 @@ -1,2 +1,2 @@
135 @@ -1,4 +1,4 @@
122 $ echo babar
136 $ echo babar
123 - rataxes
137 - rataxes
124 + babar
138 + babar
139 This is a noop statement so that
140 this test is still more bytes than success.
125
141
126 ERROR: test-failure*.t output changed (glob)
142 ERROR: test-failure*.t output changed (glob)
127 !
143 !
128 --- $TESTTMP/test-failure*.t (glob)
144 --- $TESTTMP/test-failure*.t (glob)
129 +++ $TESTTMP/test-failure*.t.err (glob)
145 +++ $TESTTMP/test-failure*.t.err (glob)
130 @@ -1,2 +1,2 @@
146 @@ -1,4 +1,4 @@
131 $ echo babar
147 $ echo babar
132 - rataxes
148 - rataxes
133 + babar
149 + babar
150 This is a noop statement so that
151 this test is still more bytes than success.
134
152
135 ERROR: test-failure*.t output changed (glob)
153 ERROR: test-failure*.t output changed (glob)
136 !
154 !
@@ -156,10 +174,12 b' Refuse the fix'
156
174
157 --- $TESTTMP/test-failure.t
175 --- $TESTTMP/test-failure.t
158 +++ $TESTTMP/test-failure.t.err
176 +++ $TESTTMP/test-failure.t.err
159 @@ -1,2 +1,2 @@
177 @@ -1,4 +1,4 @@
160 $ echo babar
178 $ echo babar
161 - rataxes
179 - rataxes
162 + babar
180 + babar
181 This is a noop statement so that
182 this test is still more bytes than success.
163 Accept this change? [n]
183 Accept this change? [n]
164 ERROR: test-failure.t output changed
184 ERROR: test-failure.t output changed
165 !.
185 !.
@@ -171,6 +191,8 b' Refuse the fix'
171 $ cat test-failure.t
191 $ cat test-failure.t
172 $ echo babar
192 $ echo babar
173 rataxes
193 rataxes
194 This is a noop statement so that
195 this test is still more bytes than success.
174
196
175 Accept the fix
197 Accept the fix
176
198
@@ -178,16 +200,20 b' Accept the fix'
178
200
179 --- $TESTTMP/test-failure.t
201 --- $TESTTMP/test-failure.t
180 +++ $TESTTMP/test-failure.t.err
202 +++ $TESTTMP/test-failure.t.err
181 @@ -1,2 +1,2 @@
203 @@ -1,4 +1,4 @@
182 $ echo babar
204 $ echo babar
183 - rataxes
205 - rataxes
184 + babar
206 + babar
207 This is a noop statement so that
208 this test is still more bytes than success.
185 Accept this change? [n] ..
209 Accept this change? [n] ..
186 # Ran 2 tests, 0 skipped, 0 warned, 0 failed.
210 # Ran 2 tests, 0 skipped, 0 warned, 0 failed.
187
211
188 $ cat test-failure.t
212 $ cat test-failure.t
189 $ echo babar
213 $ echo babar
190 babar
214 babar
215 This is a noop statement so that
216 this test is still more bytes than success.
191
217
192 (reinstall)
218 (reinstall)
193 $ mv backup test-failure.t
219 $ mv backup test-failure.t
General Comments 0
You need to be logged in to leave comments. Login now