Patchwork tests: stabilize test-split.t for Windows

login
register
mail settings
Submitter Matt Harbison
Date March 9, 2019, 5:57 p.m.
Message ID <0cbcb3e13fcf70856b03.1552154255@Envy>
Download mbox | patch
Permalink /patch/39169/
State Accepted
Headers show

Comments

Matt Harbison - March 9, 2019, 5:57 p.m.
# HG changeset patch
# User Matt Harbison <matt_harbison@yahoo.com>
# Date 1552154124 18000
#      Sat Mar 09 12:55:24 2019 -0500
# Node ID 0cbcb3e13fcf70856b03f78edbf6ae92244b9aba
# Parent  e82c932c01e30121a10580e5caaeca78fec34008
tests: stabilize test-split.t for Windows

It looks like there will be additional problems beyond this trivial fix, but
this should make the bot green again.
Yuya Nishihara - March 10, 2019, 12:50 a.m.
On Sat, 09 Mar 2019 12:57:35 -0500, Matt Harbison wrote:
> # HG changeset patch
> # User Matt Harbison <matt_harbison@yahoo.com>
> # Date 1552154124 18000
> #      Sat Mar 09 12:55:24 2019 -0500
> # Node ID 0cbcb3e13fcf70856b03f78edbf6ae92244b9aba
> # Parent  e82c932c01e30121a10580e5caaeca78fec34008
> tests: stabilize test-split.t for Windows

Queued, thanks.

Patch

diff --git a/tests/test-split.t b/tests/test-split.t
--- a/tests/test-split.t
+++ b/tests/test-split.t
@@ -718,8 +718,12 @@  Testing the case in split when commiting
   $ echo foo > foo
   $ hg add foo
   $ hg ci -m "initial"
-  $ chmod +x foo
-  $ hg ci -m "make executable"
+  $ hg import -q --bypass -m "make executable" - <<EOF
+  > diff --git a/foo b/foo
+  > old mode 100644
+  > new mode 100755
+  > EOF
+  $ hg up -q
 
   $ hg glog
   @  1:3a2125f0f4cb make executable
@@ -727,6 +731,7 @@  Testing the case in split when commiting
   o  0:51f273a58d82 initial
   
 
+#if no-windows
   $ printf 'y\ny\ny\n' | hg split
   diff --git a/foo b/foo
   old mode 100644
@@ -751,3 +756,11 @@  Testing the case in split when commiting
   new mode 100755
   examine changes to 'foo'? [Ynesfdaq?] abort: response expected
   [255]
+#else
+
+TODO: Fix this on Windows. See issue 2020 and 5883
+
+  $ printf 'y\ny\ny\n' | hg split
+  abort: cannot split an empty revision
+  [255]
+#endif