Fossil SCM

Marked invocations of fossil that are expected to return a non-zero status with the -expectError flag in the amend, clean, and merge5 test files. This makes tester.tcl -quiet be truely quiet for those files when all tests are passing. Deliberately did not mark the invocation in merge6.test which foreshadows the failure of the merge_multi-4 test, as it is not clear to me whether the bug is in the test case or in fossil.

rberteig 2016-01-27 02:14 rberteig-json-test
Commit 62f59956f52bc00ca7f52139d5306b1019ba478f
Parent 4e0e141e0d7249c…
3 files changed +4 -4 +3 -3 +2 -2
~ test/amend.test ~ test/clean.test ~ test/merge5.test
M test/amend.test
+4 -4
--- test/amend.test
+++ test/amend.test
@@ -221,11 +221,11 @@
221221
 }
222222
 set sc 0
223223
 foreach badformat $badformats {
224224
 incr sc
225225
 set datetime [clock format $timestamp -format $badformat -gmt 1]
226
- fossil amend $UUIDINIT -date $datetime
226
+ fossil amend $UUIDINIT -date $datetime -expectError
227227
 test amend-date-2.$sc {[string first "YYYY-MM-DD HH:MM:SS" $RESULT] != -1}
228228
 }
229229
230230
 ########################################
231231
 # Test: -hide #
@@ -261,11 +261,11 @@
261261
 fossil tag ls --raw $UUIDC
262262
 test amend-close-1.2 {[string first "closed" $RESULT] != -1}
263263
 fossil timeline -n 1
264264
 test amend-close-1.3 {[string match {*Marked*"Closed".*} $RESULT]}
265265
 write_file datafile "cllf"
266
-fossil commit -m "should fail"
266
+fossil commit -m "should fail" -expectError
267267
 test amend-close-2 {[string first "closed leaf" $RESULT] != -1}
268268
269269
 set UUID3 UUID3
270270
 fossil revert
271271
 fossil update trunk
@@ -285,11 +285,11 @@
285285
 fossil timeline -n 1
286286
 test amend-close-3.3 {
287287
 [string match "*Add*propagating*\"closed\".*" $RESULT]
288288
 }
289289
 write_file datafile "changed"
290
-fossil commit -m "should fail"
290
+fossil commit -m "should fail" -expectError
291291
 test amend-close-3.4 {[string first "closed leaf" $RESULT] != -1}
292292
293293
 ########################################
294294
 # Test: -tag/-cancel #
295295
 ########################################
@@ -399,7 +399,7 @@
399399
 }
400400
401401
 ########################################
402402
 # Test: NULL UUID #
403403
 ########################################
404
-fossil amend {} -close
404
+fossil amend {} -close -expectError
405405
 test amend-null-uuid {$CODE && [string first "no such check-in" $RESULT] != -1}
406406
--- test/amend.test
+++ test/amend.test
@@ -221,11 +221,11 @@
221 }
222 set sc 0
223 foreach badformat $badformats {
224 incr sc
225 set datetime [clock format $timestamp -format $badformat -gmt 1]
226 fossil amend $UUIDINIT -date $datetime
227 test amend-date-2.$sc {[string first "YYYY-MM-DD HH:MM:SS" $RESULT] != -1}
228 }
229
230 ########################################
231 # Test: -hide #
@@ -261,11 +261,11 @@
261 fossil tag ls --raw $UUIDC
262 test amend-close-1.2 {[string first "closed" $RESULT] != -1}
263 fossil timeline -n 1
264 test amend-close-1.3 {[string match {*Marked*"Closed".*} $RESULT]}
265 write_file datafile "cllf"
266 fossil commit -m "should fail"
267 test amend-close-2 {[string first "closed leaf" $RESULT] != -1}
268
269 set UUID3 UUID3
270 fossil revert
271 fossil update trunk
@@ -285,11 +285,11 @@
285 fossil timeline -n 1
286 test amend-close-3.3 {
287 [string match "*Add*propagating*\"closed\".*" $RESULT]
288 }
289 write_file datafile "changed"
290 fossil commit -m "should fail"
291 test amend-close-3.4 {[string first "closed leaf" $RESULT] != -1}
292
293 ########################################
294 # Test: -tag/-cancel #
295 ########################################
@@ -399,7 +399,7 @@
399 }
400
401 ########################################
402 # Test: NULL UUID #
403 ########################################
404 fossil amend {} -close
405 test amend-null-uuid {$CODE && [string first "no such check-in" $RESULT] != -1}
406
--- test/amend.test
+++ test/amend.test
@@ -221,11 +221,11 @@
221 }
222 set sc 0
223 foreach badformat $badformats {
224 incr sc
225 set datetime [clock format $timestamp -format $badformat -gmt 1]
226 fossil amend $UUIDINIT -date $datetime -expectError
227 test amend-date-2.$sc {[string first "YYYY-MM-DD HH:MM:SS" $RESULT] != -1}
228 }
229
230 ########################################
231 # Test: -hide #
@@ -261,11 +261,11 @@
261 fossil tag ls --raw $UUIDC
262 test amend-close-1.2 {[string first "closed" $RESULT] != -1}
263 fossil timeline -n 1
264 test amend-close-1.3 {[string match {*Marked*"Closed".*} $RESULT]}
265 write_file datafile "cllf"
266 fossil commit -m "should fail" -expectError
267 test amend-close-2 {[string first "closed leaf" $RESULT] != -1}
268
269 set UUID3 UUID3
270 fossil revert
271 fossil update trunk
@@ -285,11 +285,11 @@
285 fossil timeline -n 1
286 test amend-close-3.3 {
287 [string match "*Add*propagating*\"closed\".*" $RESULT]
288 }
289 write_file datafile "changed"
290 fossil commit -m "should fail" -expectError
291 test amend-close-3.4 {[string first "closed leaf" $RESULT] != -1}
292
293 ########################################
294 # Test: -tag/-cancel #
295 ########################################
@@ -399,7 +399,7 @@
399 }
400
401 ########################################
402 # Test: NULL UUID #
403 ########################################
404 fossil amend {} -close -expectError
405 test amend-null-uuid {$CODE && [string first "no such check-in" $RESULT] != -1}
406
M test/clean.test
+3 -3
--- test/clean.test
+++ test/clean.test
@@ -136,11 +136,11 @@
136136
 test clean-22 {[normalize_result] eq {f2
137137
 f4}}
138138
139139
 ###############################################################################
140140
141
-fossil undo
141
+fossil undo -expectError
142142
 test clean-23 {[normalize_result] eq {nothing to undo}}
143143
144144
 ###############################################################################
145145
146146
 # clean w/undo disabled, force, 1 file < 10MiB, 1 file > 10MiB
@@ -152,11 +152,11 @@
152152
 fossil extra
153153
 test clean-25 {[normalize_result] eq {}}
154154
155155
 ###############################################################################
156156
157
-fossil undo
157
+fossil undo -expectError
158158
 test clean-26 {[normalize_result] eq {nothing to undo}}
159159
160160
 ###############################################################################
161161
162162
 write_file f5 "f5 line"
@@ -178,12 +178,12 @@
178178
 fossil extra
179179
 test clean-29 {[normalize_result] eq {}}
180180
181181
 ###############################################################################
182182
183
-fossil undo
183
+fossil undo -expectError
184184
 test clean-30 {[normalize_result] eq {nothing to undo}}
185185
186186
 ###############################################################################
187187
188188
 fossil extra
189189
 test clean-31 {[normalize_result] eq {}}
190190
--- test/clean.test
+++ test/clean.test
@@ -136,11 +136,11 @@
136 test clean-22 {[normalize_result] eq {f2
137 f4}}
138
139 ###############################################################################
140
141 fossil undo
142 test clean-23 {[normalize_result] eq {nothing to undo}}
143
144 ###############################################################################
145
146 # clean w/undo disabled, force, 1 file < 10MiB, 1 file > 10MiB
@@ -152,11 +152,11 @@
152 fossil extra
153 test clean-25 {[normalize_result] eq {}}
154
155 ###############################################################################
156
157 fossil undo
158 test clean-26 {[normalize_result] eq {nothing to undo}}
159
160 ###############################################################################
161
162 write_file f5 "f5 line"
@@ -178,12 +178,12 @@
178 fossil extra
179 test clean-29 {[normalize_result] eq {}}
180
181 ###############################################################################
182
183 fossil undo
184 test clean-30 {[normalize_result] eq {nothing to undo}}
185
186 ###############################################################################
187
188 fossil extra
189 test clean-31 {[normalize_result] eq {}}
190
--- test/clean.test
+++ test/clean.test
@@ -136,11 +136,11 @@
136 test clean-22 {[normalize_result] eq {f2
137 f4}}
138
139 ###############################################################################
140
141 fossil undo -expectError
142 test clean-23 {[normalize_result] eq {nothing to undo}}
143
144 ###############################################################################
145
146 # clean w/undo disabled, force, 1 file < 10MiB, 1 file > 10MiB
@@ -152,11 +152,11 @@
152 fossil extra
153 test clean-25 {[normalize_result] eq {}}
154
155 ###############################################################################
156
157 fossil undo -expectError
158 test clean-26 {[normalize_result] eq {nothing to undo}}
159
160 ###############################################################################
161
162 write_file f5 "f5 line"
@@ -178,12 +178,12 @@
178 fossil extra
179 test clean-29 {[normalize_result] eq {}}
180
181 ###############################################################################
182
183 fossil undo -expectError
184 test clean-30 {[normalize_result] eq {nothing to undo}}
185
186 ###############################################################################
187
188 fossil extra
189 test clean-31 {[normalize_result] eq {}}
190
M test/merge5.test
+2 -2
--- test/merge5.test
+++ test/merge5.test
@@ -222,11 +222,11 @@
222222
 35815cf5804e8933eab64ae34e00bbb381be72c5 four.txt
223223
 da5c8346496f3421cb58f84b6e59e9531d9d424d one.txt
224224
 ed24d19d726d173f18dbf4a9a0f8514daa3e3ca4 three.txt
225225
 278a402316510f6ae4a77186796a6bde78c7dbc1 two.txt
226226
 }
227
-fossil merge br4
227
+fossil merge br4 -expectError
228228
 checkout-test 121 {
229229
 35815cf5804e8933eab64ae34e00bbb381be72c5 four.txt
230230
 ed24d19d726d173f18dbf4a9a0f8514daa3e3ca4 three.txt
231231
 278a402316510f6ae4a77186796a6bde78c7dbc1 two.txt
232232
 }
@@ -235,11 +235,11 @@
235235
 checkout-test 122 {
236236
 6e167b139c294bed560e2e30b352361b101e1f39 four.txt
237237
 ed24d19d726d173f18dbf4a9a0f8514daa3e3ca4 three.txt
238238
 278a402316510f6ae4a77186796a6bde78c7dbc1 two.txt
239239
 }
240
-fossil merge br1
240
+fossil merge br1 -expectError
241241
 checkout-test 123 {
242242
 6e167b139c294bed560e2e30b352361b101e1f39 four.txt
243243
 ed24d19d726d173f18dbf4a9a0f8514daa3e3ca4 three.txt
244244
 278a402316510f6ae4a77186796a6bde78c7dbc1 two.txt
245245
 }
246246
--- test/merge5.test
+++ test/merge5.test
@@ -222,11 +222,11 @@
222 35815cf5804e8933eab64ae34e00bbb381be72c5 four.txt
223 da5c8346496f3421cb58f84b6e59e9531d9d424d one.txt
224 ed24d19d726d173f18dbf4a9a0f8514daa3e3ca4 three.txt
225 278a402316510f6ae4a77186796a6bde78c7dbc1 two.txt
226 }
227 fossil merge br4
228 checkout-test 121 {
229 35815cf5804e8933eab64ae34e00bbb381be72c5 four.txt
230 ed24d19d726d173f18dbf4a9a0f8514daa3e3ca4 three.txt
231 278a402316510f6ae4a77186796a6bde78c7dbc1 two.txt
232 }
@@ -235,11 +235,11 @@
235 checkout-test 122 {
236 6e167b139c294bed560e2e30b352361b101e1f39 four.txt
237 ed24d19d726d173f18dbf4a9a0f8514daa3e3ca4 three.txt
238 278a402316510f6ae4a77186796a6bde78c7dbc1 two.txt
239 }
240 fossil merge br1
241 checkout-test 123 {
242 6e167b139c294bed560e2e30b352361b101e1f39 four.txt
243 ed24d19d726d173f18dbf4a9a0f8514daa3e3ca4 three.txt
244 278a402316510f6ae4a77186796a6bde78c7dbc1 two.txt
245 }
246
--- test/merge5.test
+++ test/merge5.test
@@ -222,11 +222,11 @@
222 35815cf5804e8933eab64ae34e00bbb381be72c5 four.txt
223 da5c8346496f3421cb58f84b6e59e9531d9d424d one.txt
224 ed24d19d726d173f18dbf4a9a0f8514daa3e3ca4 three.txt
225 278a402316510f6ae4a77186796a6bde78c7dbc1 two.txt
226 }
227 fossil merge br4 -expectError
228 checkout-test 121 {
229 35815cf5804e8933eab64ae34e00bbb381be72c5 four.txt
230 ed24d19d726d173f18dbf4a9a0f8514daa3e3ca4 three.txt
231 278a402316510f6ae4a77186796a6bde78c7dbc1 two.txt
232 }
@@ -235,11 +235,11 @@
235 checkout-test 122 {
236 6e167b139c294bed560e2e30b352361b101e1f39 four.txt
237 ed24d19d726d173f18dbf4a9a0f8514daa3e3ca4 three.txt
238 278a402316510f6ae4a77186796a6bde78c7dbc1 two.txt
239 }
240 fossil merge br1 -expectError
241 checkout-test 123 {
242 6e167b139c294bed560e2e30b352361b101e1f39 four.txt
243 ed24d19d726d173f18dbf4a9a0f8514daa3e3ca4 three.txt
244 278a402316510f6ae4a77186796a6bde78c7dbc1 two.txt
245 }
246

Keyboard Shortcuts

Open search /
Next entry (timeline) j
Previous entry (timeline) k
Open focused entry Enter
Show this help ?
Toggle theme Top nav button