Patchwork [2,of,2] tests: stabilize test-extdiff.t on Windows

login
register
mail settings
Submitter Matt Harbison
Date Feb. 7, 2019, 4:49 a.m.
Message ID <be25868885e37c1d321a.1549514990@Envy>
Download mbox | patch
Permalink /patch/38515/
State Accepted
Headers show

Comments

Matt Harbison - Feb. 7, 2019, 4:49 a.m.
# HG changeset patch
# User Matt Harbison <matt_harbison@yahoo.com>
# Date 1549514496 18000
#      Wed Feb 06 23:41:36 2019 -0500
# Node ID be25868885e37c1d321a9519e7b5d2cedfbd592b
# Parent  847900c2b99e6659cc50353ddab4f980905675c4
tests: stabilize test-extdiff.t on Windows

The test harness only wanted to drop the (windows !) lines, which also means the
actual output matched the (no-windows !) lines.  So drop those annotations too.

I suspect if the output of the affected tests was actually collected on Windows,
things were quoted because TEMPDIR contained a `~` in MSYS.  Typically that
happens when the username is 9 (8?) or more characters.  I explicitly set TEMP
and TMP to something short like "C:\temp" to avoid this, because otherwise there
are a bunch of failures like this in other tests.

Patch

diff --git a/tests/test-extdiff.t b/tests/test-extdiff.t
--- a/tests/test-extdiff.t
+++ b/tests/test-extdiff.t
@@ -151,10 +151,8 @@  Test --per-file option:
 Test --per-file option for gui tool:
 
   $ hg --config extdiff.gui.alabalaf=True alabalaf -c 6 --per-file --debug
-  diffing "*\\extdiff.*\\a.46c0e4daeb72\\a" "a.81906f2b98ac\\a" (glob) (windows !)
-  diffing */extdiff.*/a.46c0e4daeb72/a a.81906f2b98ac/a (glob) (no-windows !)
-  diffing "*\\extdiff.*\\a.46c0e4daeb72\\b" "a.81906f2b98ac\\b" (glob) (windows !)
-  diffing */extdiff.*/a.46c0e4daeb72/b a.81906f2b98ac/b (glob) (no-windows !)
+  diffing */extdiff.*/a.46c0e4daeb72/a a.81906f2b98ac/a (glob)
+  diffing */extdiff.*/a.46c0e4daeb72/b a.81906f2b98ac/b (glob)
   making snapshot of 2 files from rev 46c0e4daeb72
     a
     b
@@ -169,10 +167,8 @@  Test --per-file option for gui tool:
 Test --per-file option for gui tool again:
 
   $ hg --config merge-tools.alabalaf.gui=True alabalaf -c 6 --per-file --debug
-  diffing "*\\extdiff.*\\a.46c0e4daeb72\\a" "a.81906f2b98ac\\a" (glob) (windows !)
-  diffing */extdiff.*/a.46c0e4daeb72/a a.81906f2b98ac/a (glob) (no-windows !)
-  diffing "*\\extdiff.*\\a.46c0e4daeb72\\b" "a.81906f2b98ac\\b" (glob) (windows !)
-  diffing */extdiff.*/a.46c0e4daeb72/b a.81906f2b98ac/b (glob) (no-windows !)
+  diffing */extdiff.*/a.46c0e4daeb72/a a.81906f2b98ac/a (glob)
+  diffing */extdiff.*/a.46c0e4daeb72/b a.81906f2b98ac/b (glob)
   making snapshot of 2 files from rev 46c0e4daeb72
     a
     b