Fossil SCM

Update delta1 test cases to normalize the result so they pass again. Add additional tests to cover assertion failure caused by empty delta inputs.

andybradford 2016-10-05 08:41 trunk
Commit 4ede0df9df8f49cbd6fe1f63f53e5e6b5b954985
1 file changed +12 -3
+12 -3
--- test/delta1.test
+++ test/delta1.test
@@ -34,18 +34,27 @@
3434
set f1 [read_file $f]
3535
write_file t1 $f1
3636
for {set i 0} {$i<100} {incr i} {
3737
write_file t2 [random_changes $f1 1 1 0 0.1]
3838
fossil test-delta t1 t2
39
- test delta-$base-$i-1 {$RESULT=="ok"}
39
+ test delta-$base-$i-1 {[normalize_result]=="ok"}
4040
write_file t2 [random_changes $f1 1 1 0 0.2]
4141
fossil test-delta t1 t2
42
- test delta-$base-$i-2 {$RESULT=="ok"}
42
+ test delta-$base-$i-2 {[normalize_result]=="ok"}
4343
write_file t2 [random_changes $f1 1 1 0 0.4]
4444
fossil test-delta t1 t2
45
- test delta-$base-$i-3 {$RESULT=="ok"}
45
+ test delta-$base-$i-3 {[normalize_result]=="ok"}
4646
}
4747
}
4848
49
+set empties { "" "" "" a a "" }
50
+set i 0
51
+foreach {f1 f2} $empties {
52
+ incr i
53
+ write_file t1 $f1
54
+ write_file t2 $f2
55
+ fossil test-delta t1 t2
56
+ test delta-empty-$i {[normalize_result]=="ok"}
57
+}
4958
###############################################################################
5059
5160
test_cleanup
5261
--- test/delta1.test
+++ test/delta1.test
@@ -34,18 +34,27 @@
34 set f1 [read_file $f]
35 write_file t1 $f1
36 for {set i 0} {$i<100} {incr i} {
37 write_file t2 [random_changes $f1 1 1 0 0.1]
38 fossil test-delta t1 t2
39 test delta-$base-$i-1 {$RESULT=="ok"}
40 write_file t2 [random_changes $f1 1 1 0 0.2]
41 fossil test-delta t1 t2
42 test delta-$base-$i-2 {$RESULT=="ok"}
43 write_file t2 [random_changes $f1 1 1 0 0.4]
44 fossil test-delta t1 t2
45 test delta-$base-$i-3 {$RESULT=="ok"}
46 }
47 }
48
 
 
 
 
 
 
 
 
 
49 ###############################################################################
50
51 test_cleanup
52
--- test/delta1.test
+++ test/delta1.test
@@ -34,18 +34,27 @@
34 set f1 [read_file $f]
35 write_file t1 $f1
36 for {set i 0} {$i<100} {incr i} {
37 write_file t2 [random_changes $f1 1 1 0 0.1]
38 fossil test-delta t1 t2
39 test delta-$base-$i-1 {[normalize_result]=="ok"}
40 write_file t2 [random_changes $f1 1 1 0 0.2]
41 fossil test-delta t1 t2
42 test delta-$base-$i-2 {[normalize_result]=="ok"}
43 write_file t2 [random_changes $f1 1 1 0 0.4]
44 fossil test-delta t1 t2
45 test delta-$base-$i-3 {[normalize_result]=="ok"}
46 }
47 }
48
49 set empties { "" "" "" a a "" }
50 set i 0
51 foreach {f1 f2} $empties {
52 incr i
53 write_file t1 $f1
54 write_file t2 $f2
55 fossil test-delta t1 t2
56 test delta-empty-$i {[normalize_result]=="ok"}
57 }
58 ###############################################################################
59
60 test_cleanup
61

Keyboard Shortcuts

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