Mercurial > hg
changeset 39577:cb1329738d64
tests: handle Python 3 not quoting non-empty-directory error
I assume this happens on Windows too, so I did the same regex on both
versions of the output. The whole message printed by these aborts
comes from Python, so if we want to exert control over the quoting
here it'll be a bit of a pain.
Differential Revision: https://phab.mercurial-scm.org/D4546
| author | Augie Fackler <augie@google.com> |
|---|---|
| date | Wed, 12 Sep 2018 11:38:46 -0400 |
| parents | fa4d16daf1be |
| children | b781709799f6 |
| files | tests/test-merge1.t tests/test-update-names.t |
| diffstat | 2 files changed, 4 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/tests/test-merge1.t Wed Sep 12 17:45:43 2018 +0300 +++ b/tests/test-merge1.t Wed Sep 12 11:38:46 2018 -0400 @@ -30,8 +30,8 @@ $ mkdir b && touch b/nonempty $ hg up - abort: Unlinking directory not permitted: '$TESTTMP/t/b' (windows !) - abort: Directory not empty: '$TESTTMP/t/b' (no-windows !) + abort: Unlinking directory not permitted: '?\$TESTTMP/t/b'? (re) (windows !) + abort: Directory not empty: '?\$TESTTMP/t/b'? (re) (no-windows !) [255] $ hg ci abort: last update was interrupted
--- a/tests/test-update-names.t Wed Sep 12 17:45:43 2018 +0300 +++ b/tests/test-update-names.t Wed Sep 12 11:38:46 2018 -0400 @@ -50,8 +50,8 @@ $ hg st ? name/file $ hg up 1 - abort: Unlinking directory not permitted: '$TESTTMP/r1/r2/name' (windows !) - abort: Directory not empty: '$TESTTMP/r1/r2/name' (no-windows !) + abort: Unlinking directory not permitted: '?$TESTTMP/r1/r2/name'? (re) (windows !) + abort: Directory not empty: '?\$TESTTMP/r1/r2/name'? (re) (no-windows !) [255] $ cat name/file text