Fossil SCM

In the 'mv-rm' test, adjust formatting of expected results containing 'DELETE' and 'REVERT', also to account for recent code changes.

mistachkin 2016-01-06 04:01 trunk
Commit 11444dbec7c2e25d6f5d895c3b4d213f73c09d03
Parent 81df0a48f7350f4…
1 file changed +16 -16
~ test/mv-rm.test
M test/mv-rm.test
+16 -16
--- test/mv-rm.test
+++ test/mv-rm.test
@@ -68,11 +68,11 @@
6868
 fossil mv ../f1 .
6969
 test mv-soft-relative-1 {$RESULT eq "RENAME f1 subdir1/f1"}
7070
7171
 fossil revert
7272
 test mv-soft-relative-2 {
73
- [normalize_result] eq "DELETE: subdir1/f1\nREVERTED: f1${undoMsg}"
73
+ [normalize_result] eq "DELETE subdir1/f1\nREVERT f1${undoMsg}"
7474
 }
7575
7676
 cd $rootDir
7777
7878
 ###################################
@@ -85,11 +85,11 @@
8585
 fossil mv ../f2 ./f2
8686
 test mv-soft-relative-3 {$RESULT eq "RENAME f2 subdir2/f2"}
8787
8888
 fossil revert
8989
 test mv-soft-relative-4 {
90
- [normalize_result] eq "DELETE: subdir2/f2\nREVERTED: f2${undoMsg}"
90
+ [normalize_result] eq "DELETE subdir2/f2\nREVERT f2${undoMsg}"
9191
 }
9292
9393
 cd $rootDir
9494
9595
 ########################################
@@ -104,11 +104,11 @@
104104
 [normalize_result] eq "RENAME f3 subdir3/f3\nMOVED_FILE ${rootDir}/f3"
105105
 }
106106
107107
 fossil revert
108108
 test mv-hard-relative-2 {
109
- [normalize_result] eq "DELETE: subdir3/f3\nREVERTED: f3${undoMsg}"
109
+ [normalize_result] eq "DELETE subdir3/f3\nREVERT f3${undoMsg}"
110110
 }
111111
112112
 cd $rootDir
113113
114114
 ###################################
@@ -123,11 +123,11 @@
123123
 [normalize_result] eq "RENAME f4 subdir4/f4\nMOVED_FILE ${rootDir}/f4"
124124
 }
125125
126126
 fossil revert
127127
 test mv-hard-relative-4 {
128
- [normalize_result] eq "DELETE: subdir4/f4\nREVERTED: f4${undoMsg}"
128
+ [normalize_result] eq "DELETE subdir4/f4\nREVERT f4${undoMsg}"
129129
 }
130130
131131
 cd $rootDir
132132
133133
 ########################################
@@ -140,11 +140,11 @@
140140
 fossil mv [file join $rootDir f5] [file join $rootDir subdir5]
141141
 test mv-soft-absolute-1 {$RESULT eq "RENAME f5 subdir5/f5"}
142142
143143
 fossil revert
144144
 test mv-soft-absolute-2 {
145
- [normalize_result] eq "DELETE: subdir5/f5\nREVERTED: f5${undoMsg}"
145
+ [normalize_result] eq "DELETE subdir5/f5\nREVERT f5${undoMsg}"
146146
 }
147147
148148
 cd $rootDir
149149
150150
 ###################################
@@ -157,11 +157,11 @@
157157
 fossil mv [file join $rootDir f6] [file join $rootDir subdir6 f6]
158158
 test mv-soft-absolute-3 {$RESULT eq "RENAME f6 subdir6/f6"}
159159
160160
 fossil revert
161161
 test mv-soft-absolute-4 {
162
- [normalize_result] eq "DELETE: subdir6/f6\nREVERTED: f6${undoMsg}"
162
+ [normalize_result] eq "DELETE subdir6/f6\nREVERT f6${undoMsg}"
163163
 }
164164
165165
 cd $rootDir
166166
167167
 ########################################
@@ -176,11 +176,11 @@
176176
 [normalize_result] eq "RENAME f7 subdir7/f7\nMOVED_FILE ${rootDir}/f7"
177177
 }
178178
179179
 fossil revert
180180
 test mv-hard-absolute-2 {
181
- [normalize_result] eq "DELETE: subdir7/f7\nREVERTED: f7${undoMsg}"
181
+ [normalize_result] eq "DELETE subdir7/f7\nREVERT f7${undoMsg}"
182182
 }
183183
184184
 cd $rootDir
185185
186186
 ###################################
@@ -195,11 +195,11 @@
195195
 [normalize_result] eq "RENAME f8 subdir8/f8\nMOVED_FILE ${rootDir}/f8"
196196
 }
197197
198198
 fossil revert
199199
 test mv-hard-absolute-4 {
200
- [normalize_result] eq "DELETE: subdir8/f8\nREVERTED: f8${undoMsg}"
200
+ [normalize_result] eq "DELETE subdir8/f8\nREVERT f8${undoMsg}"
201201
 }
202202
203203
 cd $rootDir
204204
205205
 ##########################################
@@ -221,11 +221,11 @@
221221
 }
222222
223223
 fossil revert
224224
 test rm-soft-relative-4 {
225225
 [normalize_result] eq \
226
- "REVERTED: subdirB/f9\nREVERTED: subdirC/f10\nREVERTED: subdirC/f11${undoMsg}"
226
+ "REVERT subdirB/f9\nREVERT subdirC/f10\nREVERT subdirC/f11${undoMsg}"
227227
 }
228228
229229
 cd $rootDir
230230
231231
 ######################################
@@ -238,11 +238,11 @@
238238
 fossil rm ../f2
239239
 test rm-soft-relative-5 {$RESULT eq "DELETED f2"}
240240
241241
 fossil revert
242242
 test rm-soft-relative-6 {
243
- [normalize_result] eq "REVERTED: f2${undoMsg}"
243
+ [normalize_result] eq "REVERT f2${undoMsg}"
244244
 }
245245
246246
 cd $rootDir
247247
248248
 ###########################################
@@ -271,11 +271,11 @@
271271
 }
272272
273273
 fossil revert
274274
 test rm-hard-relative-4 {
275275
 [normalize_result] eq \
276
- "REVERTED: subdirB/f9\nREVERTED: subdirC/f10\nREVERTED: subdirC/f11${undoMsg}"
276
+ "REVERT subdirB/f9\nREVERT subdirC/f10\nREVERT subdirC/f11${undoMsg}"
277277
 }
278278
279279
 cd $rootDir
280280
281281
 ######################################
@@ -290,11 +290,11 @@
290290
 [normalize_result] eq "DELETED f4\nDELETED_FILE ${rootDir}/f4"
291291
 }
292292
293293
 fossil revert
294294
 test rm-hard-relative-6 {
295
- [normalize_result] eq "REVERTED: f4${undoMsg}"
295
+ [normalize_result] eq "REVERT f4${undoMsg}"
296296
 }
297297
298298
 cd $rootDir
299299
300300
 ###########################################
@@ -316,11 +316,11 @@
316316
 }
317317
318318
 fossil revert
319319
 test rm-soft-absolute-4 {
320320
 [normalize_result] eq \
321
- "REVERTED: subdirB/f9\nREVERTED: subdirC/f10\nREVERTED: subdirC/f11${undoMsg}"
321
+ "REVERT subdirB/f9\nREVERT subdirC/f10\nREVERT subdirC/f11${undoMsg}"
322322
 }
323323
324324
 cd $rootDir
325325
326326
 ######################################
@@ -333,11 +333,11 @@
333333
 fossil rm [file join $rootDir f6]
334334
 test rm-soft-absolute-5 {$RESULT eq "DELETED f6"}
335335
336336
 fossil revert
337337
 test rm-soft-absolute-6 {
338
- [normalize_result] eq "REVERTED: f6${undoMsg}"
338
+ [normalize_result] eq "REVERT f6${undoMsg}"
339339
 }
340340
341341
 cd $rootDir
342342
343343
 ###########################################
@@ -364,11 +364,11 @@
364364
 }
365365
366366
 fossil revert
367367
 test rm-hard-absolute-4 {
368368
 [normalize_result] eq \
369
- "REVERTED: subdirB/f9\nREVERTED: subdirC/f10\nREVERTED: subdirC/f11${undoMsg}"
369
+ "REVERT subdirB/f9\nREVERT subdirC/f10\nREVERT subdirC/f11${undoMsg}"
370370
 }
371371
372372
 cd $rootDir
373373
374374
 ######################################
@@ -383,9 +383,9 @@
383383
 [normalize_result] eq "DELETED f8\nDELETED_FILE ${rootDir}/f8"
384384
 }
385385
386386
 fossil revert
387387
 test rm-hard-absolute-6 {
388
- [normalize_result] eq "REVERTED: f8${undoMsg}"
388
+ [normalize_result] eq "REVERT f8${undoMsg}"
389389
 }
390390
391391
 cd $rootDir
392392
--- test/mv-rm.test
+++ test/mv-rm.test
@@ -68,11 +68,11 @@
68 fossil mv ../f1 .
69 test mv-soft-relative-1 {$RESULT eq "RENAME f1 subdir1/f1"}
70
71 fossil revert
72 test mv-soft-relative-2 {
73 [normalize_result] eq "DELETE: subdir1/f1\nREVERTED: f1${undoMsg}"
74 }
75
76 cd $rootDir
77
78 ###################################
@@ -85,11 +85,11 @@
85 fossil mv ../f2 ./f2
86 test mv-soft-relative-3 {$RESULT eq "RENAME f2 subdir2/f2"}
87
88 fossil revert
89 test mv-soft-relative-4 {
90 [normalize_result] eq "DELETE: subdir2/f2\nREVERTED: f2${undoMsg}"
91 }
92
93 cd $rootDir
94
95 ########################################
@@ -104,11 +104,11 @@
104 [normalize_result] eq "RENAME f3 subdir3/f3\nMOVED_FILE ${rootDir}/f3"
105 }
106
107 fossil revert
108 test mv-hard-relative-2 {
109 [normalize_result] eq "DELETE: subdir3/f3\nREVERTED: f3${undoMsg}"
110 }
111
112 cd $rootDir
113
114 ###################################
@@ -123,11 +123,11 @@
123 [normalize_result] eq "RENAME f4 subdir4/f4\nMOVED_FILE ${rootDir}/f4"
124 }
125
126 fossil revert
127 test mv-hard-relative-4 {
128 [normalize_result] eq "DELETE: subdir4/f4\nREVERTED: f4${undoMsg}"
129 }
130
131 cd $rootDir
132
133 ########################################
@@ -140,11 +140,11 @@
140 fossil mv [file join $rootDir f5] [file join $rootDir subdir5]
141 test mv-soft-absolute-1 {$RESULT eq "RENAME f5 subdir5/f5"}
142
143 fossil revert
144 test mv-soft-absolute-2 {
145 [normalize_result] eq "DELETE: subdir5/f5\nREVERTED: f5${undoMsg}"
146 }
147
148 cd $rootDir
149
150 ###################################
@@ -157,11 +157,11 @@
157 fossil mv [file join $rootDir f6] [file join $rootDir subdir6 f6]
158 test mv-soft-absolute-3 {$RESULT eq "RENAME f6 subdir6/f6"}
159
160 fossil revert
161 test mv-soft-absolute-4 {
162 [normalize_result] eq "DELETE: subdir6/f6\nREVERTED: f6${undoMsg}"
163 }
164
165 cd $rootDir
166
167 ########################################
@@ -176,11 +176,11 @@
176 [normalize_result] eq "RENAME f7 subdir7/f7\nMOVED_FILE ${rootDir}/f7"
177 }
178
179 fossil revert
180 test mv-hard-absolute-2 {
181 [normalize_result] eq "DELETE: subdir7/f7\nREVERTED: f7${undoMsg}"
182 }
183
184 cd $rootDir
185
186 ###################################
@@ -195,11 +195,11 @@
195 [normalize_result] eq "RENAME f8 subdir8/f8\nMOVED_FILE ${rootDir}/f8"
196 }
197
198 fossil revert
199 test mv-hard-absolute-4 {
200 [normalize_result] eq "DELETE: subdir8/f8\nREVERTED: f8${undoMsg}"
201 }
202
203 cd $rootDir
204
205 ##########################################
@@ -221,11 +221,11 @@
221 }
222
223 fossil revert
224 test rm-soft-relative-4 {
225 [normalize_result] eq \
226 "REVERTED: subdirB/f9\nREVERTED: subdirC/f10\nREVERTED: subdirC/f11${undoMsg}"
227 }
228
229 cd $rootDir
230
231 ######################################
@@ -238,11 +238,11 @@
238 fossil rm ../f2
239 test rm-soft-relative-5 {$RESULT eq "DELETED f2"}
240
241 fossil revert
242 test rm-soft-relative-6 {
243 [normalize_result] eq "REVERTED: f2${undoMsg}"
244 }
245
246 cd $rootDir
247
248 ###########################################
@@ -271,11 +271,11 @@
271 }
272
273 fossil revert
274 test rm-hard-relative-4 {
275 [normalize_result] eq \
276 "REVERTED: subdirB/f9\nREVERTED: subdirC/f10\nREVERTED: subdirC/f11${undoMsg}"
277 }
278
279 cd $rootDir
280
281 ######################################
@@ -290,11 +290,11 @@
290 [normalize_result] eq "DELETED f4\nDELETED_FILE ${rootDir}/f4"
291 }
292
293 fossil revert
294 test rm-hard-relative-6 {
295 [normalize_result] eq "REVERTED: f4${undoMsg}"
296 }
297
298 cd $rootDir
299
300 ###########################################
@@ -316,11 +316,11 @@
316 }
317
318 fossil revert
319 test rm-soft-absolute-4 {
320 [normalize_result] eq \
321 "REVERTED: subdirB/f9\nREVERTED: subdirC/f10\nREVERTED: subdirC/f11${undoMsg}"
322 }
323
324 cd $rootDir
325
326 ######################################
@@ -333,11 +333,11 @@
333 fossil rm [file join $rootDir f6]
334 test rm-soft-absolute-5 {$RESULT eq "DELETED f6"}
335
336 fossil revert
337 test rm-soft-absolute-6 {
338 [normalize_result] eq "REVERTED: f6${undoMsg}"
339 }
340
341 cd $rootDir
342
343 ###########################################
@@ -364,11 +364,11 @@
364 }
365
366 fossil revert
367 test rm-hard-absolute-4 {
368 [normalize_result] eq \
369 "REVERTED: subdirB/f9\nREVERTED: subdirC/f10\nREVERTED: subdirC/f11${undoMsg}"
370 }
371
372 cd $rootDir
373
374 ######################################
@@ -383,9 +383,9 @@
383 [normalize_result] eq "DELETED f8\nDELETED_FILE ${rootDir}/f8"
384 }
385
386 fossil revert
387 test rm-hard-absolute-6 {
388 [normalize_result] eq "REVERTED: f8${undoMsg}"
389 }
390
391 cd $rootDir
392
--- test/mv-rm.test
+++ test/mv-rm.test
@@ -68,11 +68,11 @@
68 fossil mv ../f1 .
69 test mv-soft-relative-1 {$RESULT eq "RENAME f1 subdir1/f1"}
70
71 fossil revert
72 test mv-soft-relative-2 {
73 [normalize_result] eq "DELETE subdir1/f1\nREVERT f1${undoMsg}"
74 }
75
76 cd $rootDir
77
78 ###################################
@@ -85,11 +85,11 @@
85 fossil mv ../f2 ./f2
86 test mv-soft-relative-3 {$RESULT eq "RENAME f2 subdir2/f2"}
87
88 fossil revert
89 test mv-soft-relative-4 {
90 [normalize_result] eq "DELETE subdir2/f2\nREVERT f2${undoMsg}"
91 }
92
93 cd $rootDir
94
95 ########################################
@@ -104,11 +104,11 @@
104 [normalize_result] eq "RENAME f3 subdir3/f3\nMOVED_FILE ${rootDir}/f3"
105 }
106
107 fossil revert
108 test mv-hard-relative-2 {
109 [normalize_result] eq "DELETE subdir3/f3\nREVERT f3${undoMsg}"
110 }
111
112 cd $rootDir
113
114 ###################################
@@ -123,11 +123,11 @@
123 [normalize_result] eq "RENAME f4 subdir4/f4\nMOVED_FILE ${rootDir}/f4"
124 }
125
126 fossil revert
127 test mv-hard-relative-4 {
128 [normalize_result] eq "DELETE subdir4/f4\nREVERT f4${undoMsg}"
129 }
130
131 cd $rootDir
132
133 ########################################
@@ -140,11 +140,11 @@
140 fossil mv [file join $rootDir f5] [file join $rootDir subdir5]
141 test mv-soft-absolute-1 {$RESULT eq "RENAME f5 subdir5/f5"}
142
143 fossil revert
144 test mv-soft-absolute-2 {
145 [normalize_result] eq "DELETE subdir5/f5\nREVERT f5${undoMsg}"
146 }
147
148 cd $rootDir
149
150 ###################################
@@ -157,11 +157,11 @@
157 fossil mv [file join $rootDir f6] [file join $rootDir subdir6 f6]
158 test mv-soft-absolute-3 {$RESULT eq "RENAME f6 subdir6/f6"}
159
160 fossil revert
161 test mv-soft-absolute-4 {
162 [normalize_result] eq "DELETE subdir6/f6\nREVERT f6${undoMsg}"
163 }
164
165 cd $rootDir
166
167 ########################################
@@ -176,11 +176,11 @@
176 [normalize_result] eq "RENAME f7 subdir7/f7\nMOVED_FILE ${rootDir}/f7"
177 }
178
179 fossil revert
180 test mv-hard-absolute-2 {
181 [normalize_result] eq "DELETE subdir7/f7\nREVERT f7${undoMsg}"
182 }
183
184 cd $rootDir
185
186 ###################################
@@ -195,11 +195,11 @@
195 [normalize_result] eq "RENAME f8 subdir8/f8\nMOVED_FILE ${rootDir}/f8"
196 }
197
198 fossil revert
199 test mv-hard-absolute-4 {
200 [normalize_result] eq "DELETE subdir8/f8\nREVERT f8${undoMsg}"
201 }
202
203 cd $rootDir
204
205 ##########################################
@@ -221,11 +221,11 @@
221 }
222
223 fossil revert
224 test rm-soft-relative-4 {
225 [normalize_result] eq \
226 "REVERT subdirB/f9\nREVERT subdirC/f10\nREVERT subdirC/f11${undoMsg}"
227 }
228
229 cd $rootDir
230
231 ######################################
@@ -238,11 +238,11 @@
238 fossil rm ../f2
239 test rm-soft-relative-5 {$RESULT eq "DELETED f2"}
240
241 fossil revert
242 test rm-soft-relative-6 {
243 [normalize_result] eq "REVERT f2${undoMsg}"
244 }
245
246 cd $rootDir
247
248 ###########################################
@@ -271,11 +271,11 @@
271 }
272
273 fossil revert
274 test rm-hard-relative-4 {
275 [normalize_result] eq \
276 "REVERT subdirB/f9\nREVERT subdirC/f10\nREVERT subdirC/f11${undoMsg}"
277 }
278
279 cd $rootDir
280
281 ######################################
@@ -290,11 +290,11 @@
290 [normalize_result] eq "DELETED f4\nDELETED_FILE ${rootDir}/f4"
291 }
292
293 fossil revert
294 test rm-hard-relative-6 {
295 [normalize_result] eq "REVERT f4${undoMsg}"
296 }
297
298 cd $rootDir
299
300 ###########################################
@@ -316,11 +316,11 @@
316 }
317
318 fossil revert
319 test rm-soft-absolute-4 {
320 [normalize_result] eq \
321 "REVERT subdirB/f9\nREVERT subdirC/f10\nREVERT subdirC/f11${undoMsg}"
322 }
323
324 cd $rootDir
325
326 ######################################
@@ -333,11 +333,11 @@
333 fossil rm [file join $rootDir f6]
334 test rm-soft-absolute-5 {$RESULT eq "DELETED f6"}
335
336 fossil revert
337 test rm-soft-absolute-6 {
338 [normalize_result] eq "REVERT f6${undoMsg}"
339 }
340
341 cd $rootDir
342
343 ###########################################
@@ -364,11 +364,11 @@
364 }
365
366 fossil revert
367 test rm-hard-absolute-4 {
368 [normalize_result] eq \
369 "REVERT subdirB/f9\nREVERT subdirC/f10\nREVERT subdirC/f11${undoMsg}"
370 }
371
372 cd $rootDir
373
374 ######################################
@@ -383,9 +383,9 @@
383 [normalize_result] eq "DELETED f8\nDELETED_FILE ${rootDir}/f8"
384 }
385
386 fossil revert
387 test rm-hard-absolute-6 {
388 [normalize_result] eq "REVERT f8${undoMsg}"
389 }
390
391 cd $rootDir
392

Keyboard Shortcuts

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