Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Comment: | More work... |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | testerCleanup |
Files: | files | file ages | folders |
SHA1: |
29f0328cd9954ee4ea3691dfc4ee0cd3 |
User & Date: | mistachkin 2016-03-02 06:45:21.695 |
2016-03-02
| ||
06:46 | Fix typo. ... (check-in: 5c674ff2 user: mistachkin tags: testerCleanup) | |
06:45 | More work... ... (check-in: 29f0328c user: mistachkin tags: testerCleanup) | |
06:22 | Work in progress on cleaning up home/repo handling in the test suite. ... (check-in: 89f76a21 user: mistachkin tags: testerCleanup) | |
Changes to test/amend.test.
399 400 401 402 403 404 405 | } ######################################## # Test: NULL UUID # ######################################## fossil amend {} -close -expectError test amend-null-uuid {$CODE && [string first "no such check-in" $RESULT] != -1} | > > > > | 399 400 401 402 403 404 405 406 407 408 409 | } ######################################## # Test: NULL UUID # ######################################## fossil amend {} -close -expectError test amend-null-uuid {$CODE && [string first "no such check-in" $RESULT] != -1} ############################################################################### test_cleanup |
Changes to test/clean.test.
183 184 185 186 187 188 189 | fossil undo -expectError test clean-30 {[normalize_result] eq {nothing to undo}} ############################################################################### fossil extra test clean-31 {[normalize_result] eq {}} | > > > > | 183 184 185 186 187 188 189 190 191 192 193 | fossil undo -expectError test clean-30 {[normalize_result] eq {nothing to undo}} ############################################################################### fossil extra test clean-31 {[normalize_result] eq {}} ############################################################################### test_cleanup |
Changes to test/cmdline.test.
24 25 26 27 28 29 30 | fossil test-echo $cmdline test cmd-line-$testname.$i {[lrange [split $::RESULT \n] 3 end]=="\{argv\[2\] = \[$result\]\}"} incr i } } cmd-line 100 abc abc a\"bc a\"bc \"abc\" \"abc\" cmd-line 101 * * *.* *.* | > > > > | 24 25 26 27 28 29 30 31 32 33 34 | fossil test-echo $cmdline test cmd-line-$testname.$i {[lrange [split $::RESULT \n] 3 end]=="\{argv\[2\] = \[$result\]\}"} incr i } } cmd-line 100 abc abc a\"bc a\"bc \"abc\" \"abc\" cmd-line 101 * * *.* *.* ############################################################################### test_cleanup |
Changes to test/comment.test.
312 313 314 315 316 317 318 | fossil test-comment-format --width 81 --indent 9 --decode --trimcrlf --origbreak " " $orig $orig test comment-59 {$RESULT eq " xxxx xx xxxxxxx xxxx xxxxxx xxxxxxx, xxxxxxx, x xxxx xxxxxx xx xxxx xxxx\n xxxxxxx xxxxx xxxx xxxx xx xxxxxxx xxxxxxx (xxxxxx xxxxxxxxx x xxxxx).\n xxx'x xxx xxx xx xxxxx xxxx xxx xxx --xxxxxxxxxxx xxxxxx xx xx xxxx. x\n xxxxx x xxxxxx xxxx xxxx xxxx xxxx xxxx x xxxxx xx xxx x xxxxxxxx\n xxxxxxx.\n(5 lines output)"} ############################################################################### fossil test-comment-format --width 81 --indent 9 --decode --trimcrlf --origbreak "00:00:00 " "\[0000000000\] *CURRENT* $orig" $orig test comment-60 {$RESULT eq "00:00:00 \[0000000000\] *CURRENT* \n xxxx xx xxxxxxx xxxx xxxxxx xxxxxxx, xxxxxxx, x xxxx xxxxxx xx xxxx xxxx\n xxxxxxx xxxxx xxxx xxxx xx xxxxxxx xxxxxxx (xxxxxx xxxxxxxxx x xxxxx).\n xxx'x xxx xxx xx xxxxx xxxx xxx xxx --xxxxxxxxxxx xxxxxx xx xx xxxx. x\n xxxxx x xxxxxx xxxx xxxx xxxx xxxx xxxx x xxxxx xx xxx x xxxxxxxx\n xxxxxxx.\n(6 lines output)"} | > > > > | 312 313 314 315 316 317 318 319 320 321 322 | fossil test-comment-format --width 81 --indent 9 --decode --trimcrlf --origbreak " " $orig $orig test comment-59 {$RESULT eq " xxxx xx xxxxxxx xxxx xxxxxx xxxxxxx, xxxxxxx, x xxxx xxxxxx xx xxxx xxxx\n xxxxxxx xxxxx xxxx xxxx xx xxxxxxx xxxxxxx (xxxxxx xxxxxxxxx x xxxxx).\n xxx'x xxx xxx xx xxxxx xxxx xxx xxx --xxxxxxxxxxx xxxxxx xx xx xxxx. x\n xxxxx x xxxxxx xxxx xxxx xxxx xxxx xxxx x xxxxx xx xxx x xxxxxxxx\n xxxxxxx.\n(5 lines output)"} ############################################################################### fossil test-comment-format --width 81 --indent 9 --decode --trimcrlf --origbreak "00:00:00 " "\[0000000000\] *CURRENT* $orig" $orig test comment-60 {$RESULT eq "00:00:00 \[0000000000\] *CURRENT* \n xxxx xx xxxxxxx xxxx xxxxxx xxxxxxx, xxxxxxx, x xxxx xxxxxx xx xxxx xxxx\n xxxxxxx xxxxx xxxx xxxx xx xxxxxxx xxxxxxx (xxxxxx xxxxxxxxx x xxxxx).\n xxx'x xxx xxx xx xxxxx xxxx xxx xxx --xxxxxxxxxxx xxxxxx xx xx xxxx. x\n xxxxx x xxxxxx xxxx xxxx xxxx xxxx xxxx x xxxxx xx xxx x xxxxxxxx\n xxxxxxx.\n(6 lines output)"} ############################################################################### test_cleanup |
Changes to test/contains-selector.test.
43 44 45 46 47 48 49 | .a.b 1 .c 0 .d 0 {.c.d} 0 {.c .d} 1 .e 1 } | > > > > | 43 44 45 46 47 48 49 50 51 52 53 | .a.b 1 .c 0 .d 0 {.c.d} 0 {.c .d} 1 .e 1 } ############################################################################### test_cleanup |
Changes to test/delta1.test.
39 40 41 42 43 44 45 | fossil test-delta t1 t2 test delta-$base-$i-2 {$RESULT=="ok"} write_file t2 [random_changes $f1 1 1 0 0.4] fossil test-delta t1 t2 test delta-$base-$i-3 {$RESULT=="ok"} } } | > > > > | 39 40 41 42 43 44 45 46 47 48 49 | fossil test-delta t1 t2 test delta-$base-$i-2 {$RESULT=="ok"} write_file t2 [random_changes $f1 1 1 0 0.4] fossil test-delta t1 t2 test delta-$base-$i-3 {$RESULT=="ok"} } } ############################################################################### test_cleanup |
Changes to test/file1.test.
94 95 96 97 98 99 100 | absolute-tree-name 102 test1 [pwd]/test $dirname/file1/test . [pwd]/file1 $dirname/file1/file1 . [pwd]/file1/file2 $dirname/file1/file1/file2 absolute-tree-name 103 . [pwd] $dirname/file1 catch {file delete test1/test2} catch {file delete test1} if {[info exists savedPwd]} {cd $savedPwd; unset savedPwd} | > > > > | 94 95 96 97 98 99 100 101 102 103 104 | absolute-tree-name 102 test1 [pwd]/test $dirname/file1/test . [pwd]/file1 $dirname/file1/file1 . [pwd]/file1/file2 $dirname/file1/file1/file2 absolute-tree-name 103 . [pwd] $dirname/file1 catch {file delete test1/test2} catch {file delete test1} if {[info exists savedPwd]} {cd $savedPwd; unset savedPwd} ############################################################################### test_cleanup |
Changes to test/glob.test.
178 179 180 181 182 183 184 | 0 one two three,four}] glob-parse 119 "'o*,two three,four'" "one,two three,four" \ [string map [list \r\n \n] \ {SQL expression: (x GLOB 'o*,two three,four') pattern[0] = [o*,two three,four] 1 one,two three,four}] | > > > > | 178 179 180 181 182 183 184 185 186 187 188 | 0 one two three,four}] glob-parse 119 "'o*,two three,four'" "one,two three,four" \ [string map [list \r\n \n] \ {SQL expression: (x GLOB 'o*,two three,four') pattern[0] = [o*,two three,four] 1 one,two three,four}] ############################################################################### test_cleanup |
Changes to test/json.test.
843 844 845 846 847 848 849 | # FOSSIL-4103 FSL_JSON_E_DB_NOT_VALID # Fossil repository db file is not valid. write_file nope.fossil { This is not a fossil repo. It ought to be a SQLite db with a well-known schema, but it is actually just a block of text. } | > > > > | 843 844 845 846 847 848 849 850 851 852 853 | # FOSSIL-4103 FSL_JSON_E_DB_NOT_VALID # Fossil repository db file is not valid. write_file nope.fossil { This is not a fossil repo. It ought to be a SQLite db with a well-known schema, but it is actually just a block of text. } ############################################################################### test_cleanup |
Changes to test/merge1.test.
396 397 398 399 400 401 402 | KLMN OPQR STUV XYZ. } fossil 3-way-merge t1 t2 t3 a23 test merge1-7.2 {[same_file t23 a23]} | > > > > | 396 397 398 399 400 401 402 403 404 405 406 | KLMN OPQR STUV XYZ. } fossil 3-way-merge t1 t2 t3 a23 test merge1-7.2 {[same_file t23 a23]} ############################################################################### test_cleanup |
Changes to test/merge2.test.
36 37 38 39 40 41 42 | write_file t32 [random_changes $f3 2 4 0 0.1] fossil 3-way-merge t1 t2 t3 a23 test merge-$base-$i-23 {[same_file a23 t23]} fossil 3-way-merge t1 t3 t2 a32 test merge-$base-$i-32 {[same_file a32 t32]} } } | > > > > | 36 37 38 39 40 41 42 43 44 45 46 | write_file t32 [random_changes $f3 2 4 0 0.1] fossil 3-way-merge t1 t2 t3 a23 test merge-$base-$i-23 {[same_file a23 t23]} fossil 3-way-merge t1 t3 t2 a32 test merge-$base-$i-32 {[same_file a32 t32]} } } ############################################################################### test_cleanup |
Changes to test/merge3.test.
631 632 633 634 635 636 637 | } { 1 2 3 4 5 7 8 9b a b c d e } { 1 2 3 4 5 7 8 9b } { 1 2 3 4 5 7 8 MINE: 9b a b c d e COM: 9 YOURS: 9b END } | > > > > | 631 632 633 634 635 636 637 638 639 640 641 | } { 1 2 3 4 5 7 8 9b a b c d e } { 1 2 3 4 5 7 8 9b } { 1 2 3 4 5 7 8 MINE: 9b a b c d e COM: 9 YOURS: 9b END } ############################################################################### test_cleanup |
Changes to test/merge4.test.
91 92 93 94 95 96 97 | } { 2 3 4c 5c 6c 7 8 } { 2b 3b 4c 5c 6c 7b 8b } { 2b 3b 4c 5c 6c 7b 8b } | > > > > | 91 92 93 94 95 96 97 98 99 100 101 | } { 2 3 4c 5c 6c 7 8 } { 2b 3b 4c 5c 6c 7b 8b } { 2b 3b 4c 5c 6c 7b 8b } ############################################################################### test_cleanup |
Changes to test/merge5.test.
299 300 301 302 303 304 305 | } fossil commit -nosign -m {change to two} -branch br5-2 checkout-test 142 { 7eaf64a2c9141277b4c24259c7766d6a77047af7 one.txt 98e47f99bb9fed4fdcd407f553615ca7f15a38a2 three.txt e58c5da3e6007d0e30600ea31611813093ad180f two-rename.txt } | > > > > | 299 300 301 302 303 304 305 306 307 308 309 | } fossil commit -nosign -m {change to two} -branch br5-2 checkout-test 142 { 7eaf64a2c9141277b4c24259c7766d6a77047af7 one.txt 98e47f99bb9fed4fdcd407f553615ca7f15a38a2 three.txt e58c5da3e6007d0e30600ea31611813093ad180f two-rename.txt } ############################################################################### test_cleanup |
Changes to test/merge6.test.
61 62 63 64 65 66 67 | fossil commit -m "new trunk files f2, f3, and f4 via merge" fossil ls test merge_multi-4 {[normalize_result] eq {f1 f2 f3 f4}} knownBug | > > > > | 61 62 63 64 65 66 67 68 69 70 71 | fossil commit -m "new trunk files f2, f3, and f4 via merge" fossil ls test merge_multi-4 {[normalize_result] eq {f1 f2 f3 f4}} knownBug ############################################################################### test_cleanup |
Changes to test/merge_renames.test.
201 202 203 204 205 206 207 | ###################################### # # Tests for troubles not specifically linked with renames but that I'd like to # write: # [c26c63eb1b] - 'merge --backout' does not handle conflicts properly # [953031915f] - Lack of warning when overwriting extra files # [4df5f38f1e] - Troubles merging a file delete with a file change | > > > > | 201 202 203 204 205 206 207 208 209 210 211 | ###################################### # # Tests for troubles not specifically linked with renames but that I'd like to # write: # [c26c63eb1b] - 'merge --backout' does not handle conflicts properly # [953031915f] - Lack of warning when overwriting extra files # [4df5f38f1e] - Troubles merging a file delete with a file change ############################################################################### test_cleanup |
Changes to test/mv-rm.test.
381 382 383 384 385 386 387 | fossil revert test rm-hard-absolute-6 { [normalize_result] eq "REVERT f8${undoMsg}" } cd $rootDir | > > > > | 381 382 383 384 385 386 387 388 389 390 391 | fossil revert test rm-hard-absolute-6 { [normalize_result] eq "REVERT f8${undoMsg}" } cd $rootDir ############################################################################### test_cleanup |
Changes to test/revert.test.
184 185 186 187 188 189 190 | fossil mv --soft f1 f1new test 3-mv-1 {[file exists f1]} test 3-mv-2 {![file exists f1new]} revert-test 3-1 {} { REVERT f1 DELETE f1new } -exists {f1} -notexists {f1n} | > > > > | 184 185 186 187 188 189 190 191 192 193 194 | fossil mv --soft f1 f1new test 3-mv-1 {[file exists f1]} test 3-mv-2 {![file exists f1new]} revert-test 3-1 {} { REVERT f1 DELETE f1new } -exists {f1} -notexists {f1n} ############################################################################### test_cleanup |
Changes to test/stash.test.
387 388 389 390 391 392 393 | # fossil stash apply ?STASHID? # fossil stash goto ?STASHID? # fossil stash rm|drop ?STASHID? ?-a|--all? #fossil checkout --force c1 #fossil clean | > > > > | 387 388 389 390 391 392 393 394 395 396 397 | # fossil stash apply ?STASHID? # fossil stash goto ?STASHID? # fossil stash rm|drop ?STASHID? ?-a|--all? #fossil checkout --force c1 #fossil clean ############################################################################### test_cleanup |
Changes to test/tester.tcl.
200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 | set projectName [string trim $projectName] regexp -line -- {^local-root: (.*)$} $res dummy localRoot set localRoot [string trim $localRoot] error "Detected an open checkout of project \"$projectName\",\ rooted at \"$localRoot\", testing halted" } } proc is_home_elsewhere {} { return [expr {[info exists ::env(FOSSIL_HOME)] && \ $::env(FOSSIL_HOME) eq $::tempHomePath}] } proc set_home_to_elsewhere {} { # # Fossil will write data on $HOME (or $FOSSIL_HOME). We need not # to clutter the real $HOME (or $FOSSIL_HOME) of the test caller. # | > > > > > > > > > > > > > > > > > > > > > > > | < < < < < | > > > > > > > > < < > < | 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 | set projectName [string trim $projectName] regexp -line -- {^local-root: (.*)$} $res dummy localRoot set localRoot [string trim $localRoot] error "Detected an open checkout of project \"$projectName\",\ rooted at \"$localRoot\", testing halted" } } proc get_script_or_fail {} { set fileName [file normalize [info script]] if {[string length $fileName] == 0 || ![file exists $fileName]} { error "Failed to obtain the file name of the test being run." } return $fileName } proc test_cleanup {} { if {![info exists ::tempRepoPath]} {return} if {![file exists $::tempRepoPath]} {return} if {![file isdirectory $::tempRepoPath]} {return} set tempPathEnd [expr {[string length $::tempPath] - 1}] if {[string length $::tempPath] == 0 || \ [string range $::tempRepoPath 0 $tempPathEnd] ne $::tempPath} { error "Temporary repository path has wrong parent during cleanup." } catch {file delete -force $::tempRepoPath} if {[info exists ::tempSavedPwd]} { cd $::tempSavedPwd; unset ::tempSavedPwd } } proc is_home_elsewhere {} { return [expr {[info exists ::env(FOSSIL_HOME)] && \ $::env(FOSSIL_HOME) eq $::tempHomePath}] } proc set_home_to_elsewhere {} { # # Fossil will write data on $HOME (or $FOSSIL_HOME). We need not # to clutter the real $HOME (or $FOSSIL_HOME) of the test caller. # if {[is_home_elsewhere]} {return} set ::env(FOSSIL_HOME) $::tempHomePath } # # Create and open a new Fossil repository and clean the checkout # proc repo_init {{filename ".rep.fossil"}} { set_home_to_elsewhere set ::tempRepoPath [file join \ $tempPath repo_[pid] [string trim [clock seconds] -] \ [file tail [get_script_or_fail]]] if {[catch { file mkdir $::tempRepoPath } error] != 0} { error "could not make directory \"$::tempRepoPath\",\ please set TEMP variable in environment: $error" } set ::tempSavedPwd [pwd]; cd $::tempRepoPath exec $::fossilexe new $filename exec $::fossilexe open $filename exec $::fossilexe set mtime-changes off } # This procedure only returns non-zero if the Tcl integration feature was # enabled at compile-time and is now enabled at runtime. proc is_tcl_usable_by_fossil {} { fossil test-th-eval "hasfeature tcl" |
Changes to test/th1-docs.test.
55 56 57 58 59 60 61 | set RESULT [test_fossil_http \ $repository $dataFileName /doc/trunk/test/fileStat.th1] } test th1-docs-1a {[regexp {<title>Fossil: test/fileStat.th1</title>} $RESULT]} test th1-docs-1b {[regexp {>\[[0-9a-f]{40}\]<} $RESULT]} test th1-docs-1c {[regexp { contains \d+ files\.} $RESULT]} | > > > > | 55 56 57 58 59 60 61 62 63 64 65 | set RESULT [test_fossil_http \ $repository $dataFileName /doc/trunk/test/fileStat.th1] } test th1-docs-1a {[regexp {<title>Fossil: test/fileStat.th1</title>} $RESULT]} test th1-docs-1b {[regexp {>\[[0-9a-f]{40}\]<} $RESULT]} test th1-docs-1c {[regexp { contains \d+ files\.} $RESULT]} ############################################################################### test_cleanup |
Changes to test/th1-hooks.test.
193 194 195 196 197 198 199 | test th1-custom-web-1b {[last_data_line] eq \ {<h1><b>command_hook http webpage_hook test1 webpage_notify test1</b></h1>}} ############################################################################### restoreTh1SetupFile | > > > > | 193 194 195 196 197 198 199 200 201 202 203 | test th1-custom-web-1b {[last_data_line] eq \ {<h1><b>command_hook http webpage_hook test1 webpage_notify test1</b></h1>}} ############################################################################### restoreTh1SetupFile ############################################################################### test_cleanup |
Changes to test/th1-repo.test.
80 81 82 83 84 85 86 | test th1-dir-3.6 {[regexp -- $dateTime [lindex [lindex $RESULT 1] 2]]} test th1-dir-3.7 {[lindex [lindex $RESULT 2] 0] eq "subdirB/f8.md"} test th1-dir-3.8 {[lindex [lindex $RESULT 2] 1] == 2} test th1-dir-3.9 {[regexp -- $dateTime [lindex [lindex $RESULT 2] 2]]} test th1-dir-3.10 {[lindex [lindex $RESULT 3] 0] eq "subdirC/f10.md"} test th1-dir-3.11 {[lindex [lindex $RESULT 3] 1] == 3} test th1-dir-3.12 {[regexp -- $dateTime [lindex [lindex $RESULT 3] 2]]} | > > > > | 80 81 82 83 84 85 86 87 88 89 90 | test th1-dir-3.6 {[regexp -- $dateTime [lindex [lindex $RESULT 1] 2]]} test th1-dir-3.7 {[lindex [lindex $RESULT 2] 0] eq "subdirB/f8.md"} test th1-dir-3.8 {[lindex [lindex $RESULT 2] 1] == 2} test th1-dir-3.9 {[regexp -- $dateTime [lindex [lindex $RESULT 2] 2]]} test th1-dir-3.10 {[lindex [lindex $RESULT 3] 0] eq "subdirC/f10.md"} test th1-dir-3.11 {[lindex [lindex $RESULT 3] 1] == 3} test th1-dir-3.12 {[regexp -- $dateTime [lindex [lindex $RESULT 3] 2]]} ############################################################################### test_cleanup |
Changes to test/th1-tcl.test.
171 172 173 174 175 176 177 | fossil test-th-eval "tclMakeSafe; tclEval set x 2" test th1-tcl-16 {[normalize_result] eq {2}} ############################################################################### fossil test-th-eval "tclMakeSafe; tclEval set x 2; tclEval info vars x" test th1-tcl-17 {[normalize_result] eq {x}} | > > > > | 171 172 173 174 175 176 177 178 179 180 181 | fossil test-th-eval "tclMakeSafe; tclEval set x 2" test th1-tcl-16 {[normalize_result] eq {2}} ############################################################################### fossil test-th-eval "tclMakeSafe; tclEval set x 2; tclEval info vars x" test th1-tcl-17 {[normalize_result] eq {x}} ############################################################################### test_cleanup |
Changes to test/th1.test.
1449 1450 1451 1452 1453 1454 1455 | return [string trim $x] set y; # NOTE: Never hit. } fossil test-th-source $th1FileName test th1-source-1 {$RESULT eq {TH_RETURN: 0 1 2 3 4 5 6 7 8 9}} file delete $th1FileName | > > > > | 1449 1450 1451 1452 1453 1454 1455 1456 1457 1458 1459 | return [string trim $x] set y; # NOTE: Never hit. } fossil test-th-source $th1FileName test th1-source-1 {$RESULT eq {TH_RETURN: 0 1 2 3 4 5 6 7 8 9}} file delete $th1FileName ############################################################################### test_cleanup |
Changes to test/utf.test.
23488 23489 23490 23491 23492 23493 23494 | Has flag LOOK_INVALID: yes Has flag LOOK_ODD: no Has flag LOOK_SHORT: no} ############################ END GENERATED SECTION ############################ deleteTestFiles $tempPath 100 | > > > > | 23488 23489 23490 23491 23492 23493 23494 23495 23496 23497 23498 | Has flag LOOK_INVALID: yes Has flag LOOK_ODD: no Has flag LOOK_SHORT: no} ############################ END GENERATED SECTION ############################ deleteTestFiles $tempPath 100 ############################################################################### test_cleanup |