Mercurial > hg
changeset 39593:c8514f858788
tests: stabilize change for handling not quoting non-empty-directory
The change originated in cb1329738d64. I suspect the problem is with the
combination of (re) and the '\' to '/' retry on Windows. I've no idea if py3 on
Windows needs the quoting, since it can't even run `hg` with no arguments.
(It's dying somewhere on the ctype declarations when win32.py is imported.)
| author | Matt Harbison <matt_harbison@yahoo.com> |
|---|---|
| date | Wed, 12 Sep 2018 23:10:59 -0400 |
| parents | 5e78c100a215 |
| children | bdb41eaa8b59 |
| files | tests/test-merge1.t tests/test-update-names.t |
| diffstat | 2 files changed, 2 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/tests/test-merge1.t Tue Aug 21 15:25:46 2018 -0400 +++ b/tests/test-merge1.t Wed Sep 12 23:10:59 2018 -0400 @@ -30,7 +30,7 @@ $ mkdir b && touch b/nonempty $ hg up - abort: Unlinking directory not permitted: '?\$TESTTMP/t/b'? (re) (windows !) + abort: Unlinking directory not permitted: *$TESTTMP/t/b* (glob) (windows !) abort: Directory not empty: '?\$TESTTMP/t/b'? (re) (no-windows !) [255] $ hg ci
--- a/tests/test-update-names.t Tue Aug 21 15:25:46 2018 -0400 +++ b/tests/test-update-names.t Wed Sep 12 23:10:59 2018 -0400 @@ -50,7 +50,7 @@ $ hg st ? name/file $ hg up 1 - abort: Unlinking directory not permitted: '?$TESTTMP/r1/r2/name'? (re) (windows !) + abort: Unlinking directory not permitted: *$TESTTMP/r1/r2/name* (glob) (windows !) abort: Directory not empty: '?\$TESTTMP/r1/r2/name'? (re) (no-windows !) [255] $ cat name/file