Patchwork tests: stabilize change for handling not quoting non-empty-directory

login
register
mail settings
Submitter Matt Harbison
Date Sept. 13, 2018, 3:14 a.m.
Message ID <c8514f858788ffebee5f.1536808491@Envy>
Download mbox | patch
Permalink /patch/34598/
State Accepted
Headers show

Comments

Matt Harbison - Sept. 13, 2018, 3:14 a.m.
# HG changeset patch
# User Matt Harbison <matt_harbison@yahoo.com>
# Date 1536808259 14400
#      Wed Sep 12 23:10:59 2018 -0400
# Node ID c8514f858788ffebee5f5e01a24d20e00e9d68a8
# Parent  5e78c100a21586dfdc622a86537c0a0231652e1d
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.)
Yuya Nishihara - Sept. 13, 2018, 10:58 a.m.
On Wed, 12 Sep 2018 23:14:51 -0400, Matt Harbison wrote:
> # HG changeset patch
> # User Matt Harbison <matt_harbison@yahoo.com>
> # Date 1536808259 14400
> #      Wed Sep 12 23:10:59 2018 -0400
> # Node ID c8514f858788ffebee5f5e01a24d20e00e9d68a8
> # Parent  5e78c100a21586dfdc622a86537c0a0231652e1d
> tests: stabilize change for handling not quoting non-empty-directory

Queued, thanks.

Patch

diff --git a/tests/test-merge1.t b/tests/test-merge1.t
--- a/tests/test-merge1.t
+++ b/tests/test-merge1.t
@@ -30,7 +30,7 @@  of the files in a commit we're updating 
 
   $ 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
diff --git a/tests/test-update-names.t b/tests/test-update-names.t
--- a/tests/test-update-names.t
+++ b/tests/test-update-names.t
@@ -50,7 +50,7 @@  make sure that this does not erase untra
   $ 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