Fossil SCM
Fix a broken test case stash-3-4-mv by renaming it to stash-3-2-mv and fixing the issue with comparing to the fully qulified file name in the result. Marked stash-4-2-diff-CODE and stash-4-3-diff-CODE as known bugs. Now stash.test reports only known bugs, which I believe mostly relate to handling of renamed files in a stash.
Commit
186e6a71b917bc3fa40cab5e3a3d54e0b3cdfa9c
Parent
413921cca04863b…
1 file changed
+5
-5
+5
-5
| --- test/stash.test | ||
| +++ test/stash.test | ||
| @@ -290,14 +290,14 @@ | ||
| 290 | 290 | write_file f2 "f2" |
| 291 | 291 | fossil add f1 f2 |
| 292 | 292 | fossil commit -m "baseline" |
| 293 | 293 | |
| 294 | 294 | fossil mv --hard f2 f2n |
| 295 | -test_result_state stash-3-4-mv "mv --hard f2 f2n" { | |
| 295 | +test_result_state stash-3-2-mv "mv --hard f2 f2n" [concat { | |
| 296 | 296 | RENAME f2 f2n |
| 297 | - MOVED_FILE f2 | |
| 298 | -} -changes { | |
| 297 | + MOVED_FILE} [file normalize f2] { | |
| 298 | +}] -changes { | |
| 299 | 299 | RENAMED f2n |
| 300 | 300 | } -addremove { |
| 301 | 301 | } -exists {f1 f2n} -notexists {f2} |
| 302 | 302 | |
| 303 | 303 | stash-test 3-2 {save -m f2n} { |
| @@ -357,11 +357,11 @@ | ||
| 357 | 357 | DELETED f1 |
| 358 | 358 | EDITED f2 |
| 359 | 359 | } -addremove { |
| 360 | 360 | } -exists {f0 f2 f3} -notexists {f1} |
| 361 | 361 | fossil stash diff |
| 362 | -test stash-4-2-diff-CODE {!$::CODE} ;# knownBug | |
| 362 | +test stash-4-2-diff-CODE {!$::CODE} knownBug | |
| 363 | 363 | fossil stash show |
| 364 | 364 | test stash-4-2-show-1 {[regexp {DELETE f1} $RESULT]} |
| 365 | 365 | test stash-4-2-show-2 {[regexp {CHANGED f2} $RESULT]} |
| 366 | 366 | test stash-4-2-show-3 {[regexp {ADDED f0} $RESULT]} |
| 367 | 367 | |
| @@ -376,11 +376,11 @@ | ||
| 376 | 376 | EDITED f2 |
| 377 | 377 | RENAMED f3n |
| 378 | 378 | } -addremove { |
| 379 | 379 | } -exists {f0 f2 f3n} -notexists {f1 f3} |
| 380 | 380 | fossil stash diff |
| 381 | -test stash-4-3-diff-CODE {!$::CODE} ;# knownBug | |
| 381 | +test stash-4-3-diff-CODE {!$::CODE} knownBug | |
| 382 | 382 | fossil stash show |
| 383 | 383 | test stash-4-3-show-1 {[regexp {DELETE f1} $RESULT]} |
| 384 | 384 | test stash-4-3-show-2 {[regexp {CHANGED f2} $RESULT]} |
| 385 | 385 | test stash-4-3-show-2 {[regexp {CHANGED f3n} $RESULT]} |
| 386 | 386 | test stash-4-3-show-3 {[regexp {ADDED f0} $RESULT]} |
| 387 | 387 |
| --- test/stash.test | |
| +++ test/stash.test | |
| @@ -290,14 +290,14 @@ | |
| 290 | write_file f2 "f2" |
| 291 | fossil add f1 f2 |
| 292 | fossil commit -m "baseline" |
| 293 | |
| 294 | fossil mv --hard f2 f2n |
| 295 | test_result_state stash-3-4-mv "mv --hard f2 f2n" { |
| 296 | RENAME f2 f2n |
| 297 | MOVED_FILE f2 |
| 298 | } -changes { |
| 299 | RENAMED f2n |
| 300 | } -addremove { |
| 301 | } -exists {f1 f2n} -notexists {f2} |
| 302 | |
| 303 | stash-test 3-2 {save -m f2n} { |
| @@ -357,11 +357,11 @@ | |
| 357 | DELETED f1 |
| 358 | EDITED f2 |
| 359 | } -addremove { |
| 360 | } -exists {f0 f2 f3} -notexists {f1} |
| 361 | fossil stash diff |
| 362 | test stash-4-2-diff-CODE {!$::CODE} ;# knownBug |
| 363 | fossil stash show |
| 364 | test stash-4-2-show-1 {[regexp {DELETE f1} $RESULT]} |
| 365 | test stash-4-2-show-2 {[regexp {CHANGED f2} $RESULT]} |
| 366 | test stash-4-2-show-3 {[regexp {ADDED f0} $RESULT]} |
| 367 | |
| @@ -376,11 +376,11 @@ | |
| 376 | EDITED f2 |
| 377 | RENAMED f3n |
| 378 | } -addremove { |
| 379 | } -exists {f0 f2 f3n} -notexists {f1 f3} |
| 380 | fossil stash diff |
| 381 | test stash-4-3-diff-CODE {!$::CODE} ;# knownBug |
| 382 | fossil stash show |
| 383 | test stash-4-3-show-1 {[regexp {DELETE f1} $RESULT]} |
| 384 | test stash-4-3-show-2 {[regexp {CHANGED f2} $RESULT]} |
| 385 | test stash-4-3-show-2 {[regexp {CHANGED f3n} $RESULT]} |
| 386 | test stash-4-3-show-3 {[regexp {ADDED f0} $RESULT]} |
| 387 |
| --- test/stash.test | |
| +++ test/stash.test | |
| @@ -290,14 +290,14 @@ | |
| 290 | write_file f2 "f2" |
| 291 | fossil add f1 f2 |
| 292 | fossil commit -m "baseline" |
| 293 | |
| 294 | fossil mv --hard f2 f2n |
| 295 | test_result_state stash-3-2-mv "mv --hard f2 f2n" [concat { |
| 296 | RENAME f2 f2n |
| 297 | MOVED_FILE} [file normalize f2] { |
| 298 | }] -changes { |
| 299 | RENAMED f2n |
| 300 | } -addremove { |
| 301 | } -exists {f1 f2n} -notexists {f2} |
| 302 | |
| 303 | stash-test 3-2 {save -m f2n} { |
| @@ -357,11 +357,11 @@ | |
| 357 | DELETED f1 |
| 358 | EDITED f2 |
| 359 | } -addremove { |
| 360 | } -exists {f0 f2 f3} -notexists {f1} |
| 361 | fossil stash diff |
| 362 | test stash-4-2-diff-CODE {!$::CODE} knownBug |
| 363 | fossil stash show |
| 364 | test stash-4-2-show-1 {[regexp {DELETE f1} $RESULT]} |
| 365 | test stash-4-2-show-2 {[regexp {CHANGED f2} $RESULT]} |
| 366 | test stash-4-2-show-3 {[regexp {ADDED f0} $RESULT]} |
| 367 | |
| @@ -376,11 +376,11 @@ | |
| 376 | EDITED f2 |
| 377 | RENAMED f3n |
| 378 | } -addremove { |
| 379 | } -exists {f0 f2 f3n} -notexists {f1 f3} |
| 380 | fossil stash diff |
| 381 | test stash-4-3-diff-CODE {!$::CODE} knownBug |
| 382 | fossil stash show |
| 383 | test stash-4-3-show-1 {[regexp {DELETE f1} $RESULT]} |
| 384 | test stash-4-3-show-2 {[regexp {CHANGED f2} $RESULT]} |
| 385 | test stash-4-3-show-2 {[regexp {CHANGED f3n} $RESULT]} |
| 386 | test stash-4-3-show-3 {[regexp {ADDED f0} $RESULT]} |
| 387 |