Mercurial > hg-stable
changeset 31769:bdcaf612e75a
tests: add globs for Windows
| author | Matt Harbison <matt_harbison@yahoo.com> |
|---|---|
| date | Sat, 01 Apr 2017 14:48:39 -0400 |
| parents | 264baeef3588 |
| children | 6c800688afe1 |
| files | tests/test-bookmarks-pushpull.t tests/test-https.t tests/test-largefiles-cache.t tests/test-merge-criss-cross.t tests/test-share.t tests/test-status.t |
| diffstat | 6 files changed, 23 insertions(+), 22 deletions(-) [+] |
line wrap: on
line diff
--- a/tests/test-bookmarks-pushpull.t Fri Mar 24 19:19:00 2017 -0700 +++ b/tests/test-bookmarks-pushpull.t Sat Apr 01 14:48:39 2017 -0400 @@ -581,12 +581,12 @@ be exchanged) $ hg -R repo1 incoming -B - comparing with $TESTTMP/bmcomparison/source + comparing with $TESTTMP/bmcomparison/source (glob) searching for changed bookmarks no changed bookmarks found [1] $ hg -R repo1 outgoing -B - comparing with $TESTTMP/bmcomparison/source + comparing with $TESTTMP/bmcomparison/source (glob) searching for changed bookmarks no changed bookmarks found [1]
--- a/tests/test-https.t Fri Mar 24 19:19:00 2017 -0700 +++ b/tests/test-https.t Sat Apr 01 14:48:39 2017 -0400 @@ -97,11 +97,12 @@ [255] #endif -Specifying a per-host certificate file that doesn't exist will abort +Specifying a per-host certificate file that doesn't exist will abort. The full +C:/path/to/msysroot will print on Windows. $ hg --config hostsecurity.localhost:verifycertsfile=/does/not/exist clone https://localhost:$HGPORT/ warning: connecting to localhost using legacy security technology (TLS 1.0); see https://mercurial-scm.org/wiki/SecureConnections for more info (?) - abort: path specified by hostsecurity.localhost:verifycertsfile does not exist: /does/not/exist + abort: path specified by hostsecurity.localhost:verifycertsfile does not exist: */does/not/exist (glob) [255] A malformed per-host certificate file will raise an error
--- a/tests/test-largefiles-cache.t Fri Mar 24 19:19:00 2017 -0700 +++ b/tests/test-largefiles-cache.t Sat Apr 01 14:48:39 2017 -0400 @@ -223,7 +223,7 @@ $ hg push http://localhost:$HGPORT1 -f --config files.usercache=nocache pushing to http://localhost:$HGPORT1/ searching for changes - abort: remotestore: could not open file $TESTTMP/src/.hg/largefiles/e2fb5f2139d086ded2cb600d5a91a196e76bf020: HTTP Error 403: ssl required + abort: remotestore: could not open file $TESTTMP/src/.hg/largefiles/e2fb5f2139d086ded2cb600d5a91a196e76bf020: HTTP Error 403: ssl required (glob) [255] $ rm .hg/largefiles/e2fb5f2139d086ded2cb600d5a91a196e76bf020
--- a/tests/test-merge-criss-cross.t Fri Mar 24 19:19:00 2017 -0700 +++ b/tests/test-merge-criss-cross.t Sat Apr 01 14:48:39 2017 -0400 @@ -116,11 +116,11 @@ $ f --dump --recurse * d2: directory with 2 files - d2/f3: + d2/f3: (glob) >>> 0 base <<< - d2/f4: + d2/f4: (glob) >>> 0 base <<< @@ -222,11 +222,11 @@ $ f --dump --recurse * d2: directory with 2 files - d2/f3: + d2/f3: (glob) >>> 0 base <<< - d2/f4: + d2/f4: (glob) >>> 0 base <<< @@ -308,11 +308,11 @@ $ f --dump --recurse * d2: directory with 2 files - d2/f3: + d2/f3: (glob) >>> 0 base <<< - d2/f4: + d2/f4: (glob) >>> 0 base <<<
--- a/tests/test-share.t Fri Mar 24 19:19:00 2017 -0700 +++ b/tests/test-share.t Sat Apr 01 14:48:39 2017 -0400 @@ -367,7 +367,7 @@ $ hg share -U thisdir/orig thisdir/abs $ hg share -U --relative thisdir/abs thisdir/rel $ cat thisdir/rel/.hg/sharedpath - ../../orig/.hg (no-eol) + ../../orig/.hg (no-eol) (glob) $ grep shared thisdir/*/.hg/requires thisdir/abs/.hg/requires:shared thisdir/rel/.hg/requires:shared @@ -377,22 +377,22 @@ $ cd thisdir $ hg -R rel root - $TESTTMP/thisdir/rel + $TESTTMP/thisdir/rel (glob) $ cd .. now test that relative paths really are relative, survive across renames and changes of PWD $ hg -R thisdir/abs root - $TESTTMP/thisdir/abs + $TESTTMP/thisdir/abs (glob) $ hg -R thisdir/rel root - $TESTTMP/thisdir/rel + $TESTTMP/thisdir/rel (glob) $ mv thisdir thatdir $ hg -R thatdir/abs root - abort: .hg/sharedpath points to nonexistent directory $TESTTMP/thisdir/orig/.hg! + abort: .hg/sharedpath points to nonexistent directory $TESTTMP/thisdir/orig/.hg! (glob) [255] $ hg -R thatdir/rel root - $TESTTMP/thatdir/rel + $TESTTMP/thatdir/rel (glob) test unshare relshared repo
--- a/tests/test-status.t Fri Mar 24 19:19:00 2017 -0700 +++ b/tests/test-status.t Sat Apr 01 14:48:39 2017 -0400 @@ -121,11 +121,11 @@ ? ../b/in_b ? ../in_root $ HGPLAIN=1 hg status --cwd a - ? a/1/in_a_1 - ? a/in_a - ? b/1/in_b_1 - ? b/2/in_b_2 - ? b/in_b + ? a/1/in_a_1 (glob) + ? a/in_a (glob) + ? b/1/in_b_1 (glob) + ? b/2/in_b_2 (glob) + ? b/in_b (glob) ? in_root $ cd ..