Patchwork [6,of,7] tests: conditionalize out tests that msys is mangling

login
register
mail settings
Submitter Matt Harbison
Date Aug. 18, 2018, 7:17 p.m.
Message ID <5acb07cbe37920275984.1534619825@Envy>
Download mbox | patch
Permalink /patch/33883/
State Accepted
Headers show

Comments

Matt Harbison - Aug. 18, 2018, 7:17 p.m.
# HG changeset patch
# User Matt Harbison <matt_harbison@yahoo.com>
# Date 1534615391 14400
#      Sat Aug 18 14:03:11 2018 -0400
# Node ID 5acb07cbe379202759848a2cb9d5da24df01f1a1
# Parent  c2ac7520fb6bbc0097613391f5354489808d8b5c
tests: conditionalize out tests that msys is mangling

This was exposed by ac0a87160012.  The paths for convert and ssh respectively
are being turned into:

   $TESTTMP\bzr+ssh:\foobar@selenic.com\baz\.hg

   'C:\\C:\\Users\\Matt\\AppData\\Local\\Temp\\hgtests.8awa9x\\child1\\test-ssh-bundle1.t-sshv2\\nonexistent\\.hg

The errno value raised is 123, and the message is

   The filename, directory name, or volume label syntax is incorrect

Patch

diff --git a/tests/test-convert.t b/tests/test-convert.t
--- a/tests/test-convert.t
+++ b/tests/test-convert.t
@@ -533,9 +533,11 @@  contents of fncache file:
 
 test bogus URL
 
+#if no-msys
   $ hg convert -q bzr+ssh://foobar@selenic.com/baz baz
   abort: bzr+ssh://foobar@selenic.com/baz: missing or unsupported repository
   [255]
+#endif
 
 test revset converted() lookup
 
diff --git a/tests/test-ssh-bundle1.t b/tests/test-ssh-bundle1.t
--- a/tests/test-ssh-bundle1.t
+++ b/tests/test-ssh-bundle1.t
@@ -59,10 +59,12 @@  repo not found error
 
 non-existent absolute path
 
+#if no-msys
   $ hg clone -e "\"$PYTHON\" \"$TESTDIR/dummyssh\"" ssh://user@dummy//`pwd`/nonexistent local
   remote: abort: repository /$TESTTMP/nonexistent not found!
   abort: no suitable response from remote hg!
   [255]
+#endif
 
 clone remote via stream
 
@@ -502,7 +504,7 @@  debug output
 
   $ cat dummylog
   Got arguments 1:user@dummy 2:hg -R nonexistent serve --stdio
-  Got arguments 1:user@dummy 2:hg -R /$TESTTMP/nonexistent serve --stdio
+  Got arguments 1:user@dummy 2:hg -R /$TESTTMP/nonexistent serve --stdio (no-msys !)
   Got arguments 1:user@dummy 2:hg -R remote serve --stdio
   Got arguments 1:user@dummy 2:hg -R local-stream serve --stdio (no-reposimplestore !)
   Got arguments 1:user@dummy 2:hg -R remote serve --stdio (no-reposimplestore !)