Fossil SCM

Add 'knownBug' constraints to the two failing merge tests along with the necessary test suite changes.

mistachkin 2016-01-27 01:44 trunk
Commit 60285f58765128176e4505eee752272875cacca3
Parent 08a358781436888…
3 files changed +1 -1 +3 -3 +23 -6
~ test/merge6.test ~ test/merge_renames.test ~ test/tester.tcl
M test/merge6.test
+1 -1
--- test/merge6.test
+++ test/merge6.test
@@ -62,6 +62,6 @@
6262
 fossil ls
6363
6464
 test merge_multi-4 {[normalize_result] eq {f1
6565
 f2
6666
 f3
67
-f4}}
67
+f4}} knownBug
6868
--- test/merge6.test
+++ test/merge6.test
@@ -62,6 +62,6 @@
62 fossil ls
63
64 test merge_multi-4 {[normalize_result] eq {f1
65 f2
66 f3
67 f4}}
68
--- test/merge6.test
+++ test/merge6.test
@@ -62,6 +62,6 @@
62 fossil ls
63
64 test merge_multi-4 {[normalize_result] eq {f1
65 f2
66 f3
67 f4}} knownBug
68
M test/merge_renames.test
+3 -3
--- test/merge_renames.test
+++ test/merge_renames.test
@@ -156,13 +156,13 @@
156156
 }
157157
158158
 if {$deletes!=0} {
159159
 # failed
160160
 protOut "Error, the merge should not delete any file"
161
- test merge_renames-2 0
161
+ test merge_renames-3 0
162162
 } else {
163
- test merge_renames-2 1
163
+ test merge_renames-3 1
164164
 }
165165
166166
 ######################################
167167
 # Test 4 #
168168
 # Reported: Ticket [67176c3aa4] #
@@ -198,14 +198,14 @@
198198
199199
 fossil ls
200200
201201
 test merge_renames-5 {[normalize_result] eq {f1
202202
 f2
203
-f3}}
203
+f3}} knownBug
204204
205205
 ######################################
206206
 #
207207
 # Tests for troubles not specifically linked with renames but that I'd like to
208208
 # write:
209209
 # [c26c63eb1b] - 'merge --backout' does not handle conflicts properly
210210
 # [953031915f] - Lack of warning when overwriting extra files
211211
 # [4df5f38f1e] - Troubles merging a file delete with a file change
212212
--- test/merge_renames.test
+++ test/merge_renames.test
@@ -156,13 +156,13 @@
156 }
157
158 if {$deletes!=0} {
159 # failed
160 protOut "Error, the merge should not delete any file"
161 test merge_renames-2 0
162 } else {
163 test merge_renames-2 1
164 }
165
166 ######################################
167 # Test 4 #
168 # Reported: Ticket [67176c3aa4] #
@@ -198,14 +198,14 @@
198
199 fossil ls
200
201 test merge_renames-5 {[normalize_result] eq {f1
202 f2
203 f3}}
204
205 ######################################
206 #
207 # Tests for troubles not specifically linked with renames but that I'd like to
208 # write:
209 # [c26c63eb1b] - 'merge --backout' does not handle conflicts properly
210 # [953031915f] - Lack of warning when overwriting extra files
211 # [4df5f38f1e] - Troubles merging a file delete with a file change
212
--- test/merge_renames.test
+++ test/merge_renames.test
@@ -156,13 +156,13 @@
156 }
157
158 if {$deletes!=0} {
159 # failed
160 protOut "Error, the merge should not delete any file"
161 test merge_renames-3 0
162 } else {
163 test merge_renames-3 1
164 }
165
166 ######################################
167 # Test 4 #
168 # Reported: Ticket [67176c3aa4] #
@@ -198,14 +198,14 @@
198
199 fossil ls
200
201 test merge_renames-5 {[normalize_result] eq {f1
202 f2
203 f3}} knownBug
204
205 ######################################
206 #
207 # Tests for troubles not specifically linked with renames but that I'd like to
208 # write:
209 # [c26c63eb1b] - 'merge --backout' does not handle conflicts properly
210 # [953031915f] - Lack of warning when overwriting extra files
211 # [4df5f38f1e] - Troubles merging a file delete with a file change
212
M test/tester.tcl
+23 -6
--- test/tester.tcl
+++ test/tester.tcl
@@ -58,10 +58,18 @@
5858
 set QUIET 1
5959
 set argv [lreplace $argv $i $i]
6060
 } else {
6161
 set QUIET 0
6262
 }
63
+
64
+set i [lsearch $argv -strict]
65
+if {$i>=0} {
66
+ set STRICT 1
67
+ set argv [lreplace $argv $i $i]
68
+} else {
69
+ set STRICT 0
70
+}
6371
6472
 if {[llength $argv]==0} {
6573
 foreach f [lsort [glob $testdir/*.test]] {
6674
 set base [file root [file tail $f]]
6775
 lappend argv $base
@@ -327,21 +335,30 @@
327335
 }
328336
329337
 # Perform a test
330338
 #
331339
 set test_count 0
332
-proc test {name expr} {
340
+proc test {name expr {constraints ""}} {
333341
 global bad_test test_count RESULT
334342
 incr test_count
343
+ set knownBug [expr {"knownBug" in $constraints}]
335344
 set r [uplevel 1 [list expr $expr]]
336345
 if {$r} {
337
- protOut "test $name OK"
346
+ if {$knownBug && !$::STRICT} {
347
+ protOut "test $name OK (knownBug)?"
348
+ } else {
349
+ protOut "test $name OK"
350
+ }
338351
 } else {
339
- protOut "test $name FAILED!" 1
340
- if {$::QUIET} {protOut "RESULT: $RESULT" 1}
341
- lappend bad_test $name
342
- if {$::HALT} exit
352
+ if {$knownBug && !$::STRICT} {
353
+ protOut "test $name FAILED (knownBug)!" 1
354
+ } else {
355
+ protOut "test $name FAILED!" 1
356
+ if {$::QUIET} {protOut "RESULT: $RESULT" 1}
357
+ lappend bad_test $name
358
+ if {$::HALT} exit
359
+ }
343360
 }
344361
 }
345362
 set bad_test {}
346363
347364
 # Return a random string N characters long.
348365
--- test/tester.tcl
+++ test/tester.tcl
@@ -58,10 +58,18 @@
58 set QUIET 1
59 set argv [lreplace $argv $i $i]
60 } else {
61 set QUIET 0
62 }
 
 
 
 
 
 
 
 
63
64 if {[llength $argv]==0} {
65 foreach f [lsort [glob $testdir/*.test]] {
66 set base [file root [file tail $f]]
67 lappend argv $base
@@ -327,21 +335,30 @@
327 }
328
329 # Perform a test
330 #
331 set test_count 0
332 proc test {name expr} {
333 global bad_test test_count RESULT
334 incr test_count
 
335 set r [uplevel 1 [list expr $expr]]
336 if {$r} {
337 protOut "test $name OK"
 
 
 
 
338 } else {
339 protOut "test $name FAILED!" 1
340 if {$::QUIET} {protOut "RESULT: $RESULT" 1}
341 lappend bad_test $name
342 if {$::HALT} exit
 
 
 
 
343 }
344 }
345 set bad_test {}
346
347 # Return a random string N characters long.
348
--- test/tester.tcl
+++ test/tester.tcl
@@ -58,10 +58,18 @@
58 set QUIET 1
59 set argv [lreplace $argv $i $i]
60 } else {
61 set QUIET 0
62 }
63
64 set i [lsearch $argv -strict]
65 if {$i>=0} {
66 set STRICT 1
67 set argv [lreplace $argv $i $i]
68 } else {
69 set STRICT 0
70 }
71
72 if {[llength $argv]==0} {
73 foreach f [lsort [glob $testdir/*.test]] {
74 set base [file root [file tail $f]]
75 lappend argv $base
@@ -327,21 +335,30 @@
335 }
336
337 # Perform a test
338 #
339 set test_count 0
340 proc test {name expr {constraints ""}} {
341 global bad_test test_count RESULT
342 incr test_count
343 set knownBug [expr {"knownBug" in $constraints}]
344 set r [uplevel 1 [list expr $expr]]
345 if {$r} {
346 if {$knownBug && !$::STRICT} {
347 protOut "test $name OK (knownBug)?"
348 } else {
349 protOut "test $name OK"
350 }
351 } else {
352 if {$knownBug && !$::STRICT} {
353 protOut "test $name FAILED (knownBug)!" 1
354 } else {
355 protOut "test $name FAILED!" 1
356 if {$::QUIET} {protOut "RESULT: $RESULT" 1}
357 lappend bad_test $name
358 if {$::HALT} exit
359 }
360 }
361 }
362 set bad_test {}
363
364 # Return a random string N characters long.
365

Keyboard Shortcuts

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