Mercurial > hg
changeset 18506:ef60083b5536 stable
tests: fix for windows - slashes and no serve
| author | Mads Kiilerich <madski@unity3d.com> |
|---|---|
| date | Wed, 30 Jan 2013 19:40:07 +0100 |
| parents | 9de9727cea53 |
| children | c795c9f87792 |
| files | tests/test-audit-path.t tests/test-dispatch.t tests/test-globalopts.t tests/test-largefiles.t tests/test-obsolete.t tests/test-parents.t tests/test-push-validation.t tests/test-rename.t tests/test-walk.t |
| diffstat | 9 files changed, 22 insertions(+), 18 deletions(-) [+] |
line wrap: on
line diff
--- a/tests/test-audit-path.t Wed Jan 30 19:29:36 2013 +0100 +++ b/tests/test-audit-path.t Wed Jan 30 19:40:07 2013 +0100 @@ -86,7 +86,7 @@ $ hg manifest -r4 /tmp/test $ hg update -Cr4 - abort: path contains illegal component: /tmp/test + abort: path contains illegal component: /tmp/test (glob) [255] $ cd ..
--- a/tests/test-dispatch.t Wed Jan 30 19:29:36 2013 +0100 +++ b/tests/test-dispatch.t Wed Jan 30 19:40:07 2013 +0100 @@ -46,10 +46,11 @@ $ cd "$TESTTMP" -OSError ... and with filename even when it is empty +OSError "No such file or directory" / "The system cannot find the path +specified" should include filename even when it is empty $ hg -R a archive '' - abort: No such file or directory: '' + abort: *: '' (glob) [255] #if no-outer-repo
--- a/tests/test-globalopts.t Wed Jan 30 19:29:36 2013 +0100 +++ b/tests/test-globalopts.t Wed Jan 30 19:40:07 2013 +0100 @@ -87,7 +87,7 @@ abort: no repository found in '$TESTTMP' (.hg not found)! [255] $ hg -R b ann a/a - abort: a/a not under root '$TESTTMP/b' + abort: a/a not under root '$TESTTMP/b' (glob) [255] $ hg log abort: no repository found in '$TESTTMP' (.hg not found)!
--- a/tests/test-largefiles.t Wed Jan 30 19:29:36 2013 +0100 +++ b/tests/test-largefiles.t Wed Jan 30 19:40:07 2013 +0100 @@ -1182,7 +1182,7 @@ $ pwd $TESTTMP/e $ hg paths - default = $TESTTMP/d + default = $TESTTMP/d (glob) $ hg verify --large checking changesets @@ -1212,7 +1212,7 @@ $ hg verify -q --large --lfc searching 1 changesets for largefiles changeset 9:598410d3eb9a: sub/large4: contents differ - ($TESTTMP/d/.hg/largefiles/e166e74c7303192238d60af5a9c4ce9bef0b7928: + ($TESTTMP/d/.hg/largefiles/e166e74c7303192238d60af5a9c4ce9bef0b7928: (glob) expected hash e166e74c7303192238d60af5a9c4ce9bef0b7928, but got 1f19b76d5b3cad1472c87efb42b582c97e040060) verified contents of 3 revisions of 3 largefiles @@ -1232,19 +1232,19 @@ changeset 1:ce8896473775: large1 missing (looked for hash 5f78770c0e77ba4287ad6ef3071c9bf9c379742f) changeset 1:ce8896473775: sub/large2: contents differ - ($TESTTMP/d/.hg/largefiles/eb7338044dc27f9bc59b8dd5a246b065ead7a9c4: + ($TESTTMP/d/.hg/largefiles/eb7338044dc27f9bc59b8dd5a246b065ead7a9c4: (glob) expected hash eb7338044dc27f9bc59b8dd5a246b065ead7a9c4, but got cfef678f24d3e339944138ecdd8fd85ca21d820f) changeset 3:9e8fbc4bce62: large1: contents differ - ($TESTTMP/d/.hg/largefiles/eb7338044dc27f9bc59b8dd5a246b065ead7a9c4: + ($TESTTMP/d/.hg/largefiles/eb7338044dc27f9bc59b8dd5a246b065ead7a9c4: (glob) expected hash eb7338044dc27f9bc59b8dd5a246b065ead7a9c4, but got cfef678f24d3e339944138ecdd8fd85ca21d820f) changeset 4:74c02385b94c: large3: contents differ - ($TESTTMP/d/.hg/largefiles/eb7338044dc27f9bc59b8dd5a246b065ead7a9c4: + ($TESTTMP/d/.hg/largefiles/eb7338044dc27f9bc59b8dd5a246b065ead7a9c4: (glob) expected hash eb7338044dc27f9bc59b8dd5a246b065ead7a9c4, but got cfef678f24d3e339944138ecdd8fd85ca21d820f) changeset 4:74c02385b94c: sub/large4: contents differ - ($TESTTMP/d/.hg/largefiles/eb7338044dc27f9bc59b8dd5a246b065ead7a9c4: + ($TESTTMP/d/.hg/largefiles/eb7338044dc27f9bc59b8dd5a246b065ead7a9c4: (glob) expected hash eb7338044dc27f9bc59b8dd5a246b065ead7a9c4, but got cfef678f24d3e339944138ecdd8fd85ca21d820f) verified contents of 15 revisions of 6 largefiles @@ -1343,8 +1343,8 @@ - revert should be able to revert files introduced in a pending merge $ hg revert --all -r . - removing .hglf/large - undeleting .hglf/sub2/large6 + removing .hglf/large (glob) + undeleting .hglf/sub2/large6 (glob) Test that a normal file and a largefile with the same name and path cannot coexist.
--- a/tests/test-obsolete.t Wed Jan 30 19:29:36 2013 +0100 +++ b/tests/test-obsolete.t Wed Jan 30 19:40:07 2013 +0100 @@ -708,6 +708,8 @@ adding file changes added 1 changesets with 1 changes to 1 files (+1 heads) +#if serve + check hgweb does not explode ==================================== @@ -756,3 +758,4 @@ date: Thu Jan 01 00:00:00 1970 +0000 summary: add celestine +#endif
--- a/tests/test-parents.t Wed Jan 30 19:29:36 2013 +0100 +++ b/tests/test-parents.t Wed Jan 30 19:40:07 2013 +0100 @@ -71,7 +71,7 @@ $ hg parents -r 2 ../a - abort: ../a not under root '$TESTTMP/repo' + abort: ../a not under root '$TESTTMP/repo' (glob) [255]
--- a/tests/test-push-validation.t Wed Jan 30 19:29:36 2013 +0100 +++ b/tests/test-push-validation.t Wed Jan 30 19:40:07 2013 +0100 @@ -44,7 +44,7 @@ [1] $ hg push - pushing to $TESTTMP/test + pushing to $TESTTMP/test (glob) searching for changes adding changesets adding manifests
--- a/tests/test-rename.t Wed Jan 30 19:29:36 2013 +0100 +++ b/tests/test-rename.t Wed Jan 30 19:40:07 2013 +0100 @@ -612,7 +612,7 @@ [255] $ hg status -C $ hg rename d1/d11/a1 .. - abort: ../a1 not under root '$TESTTMP' + abort: ../a1 not under root '$TESTTMP' (glob) [255] $ hg status -C
--- a/tests/test-walk.t Wed Jan 30 19:29:36 2013 +0100 +++ b/tests/test-walk.t Wed Jan 30 19:40:07 2013 +0100 @@ -181,10 +181,10 @@ f mammals/Procyonidae/raccoon mammals/Procyonidae/raccoon f mammals/skunk mammals/skunk $ hg debugwalk .. - abort: .. not under root '$TESTTMP/t' + abort: .. not under root '$TESTTMP/t' (glob) [255] $ hg debugwalk beans/../.. - abort: beans/../.. not under root '$TESTTMP/t' + abort: beans/../.. not under root '$TESTTMP/t' (glob) [255] $ hg debugwalk .hg abort: path contains illegal component: .hg (glob) @@ -209,7 +209,7 @@ f beans/pinto beans/pinto f beans/turtle beans/turtle $ hg debugwalk `pwd`/.. - abort: $TESTTMP/t/.. not under root '$TESTTMP/t' + abort: $TESTTMP/t/.. not under root '$TESTTMP/t' (glob) [255] Test patterns: