Patchwork D2676: tests: stop over-specifying tempfile name

login
register
mail settings
Submitter phabricator
Date March 8, 2018, 7:26 p.m.
Message ID <a8a1a8e08dd302b609cbed70ce95eeb9@localhost.localdomain>
Download mbox | patch
Permalink /patch/29131/
State Not Applicable
Headers show

Comments

phabricator - March 8, 2018, 7:26 p.m.
durin42 updated this revision to Diff 6732.

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D2676?vs=6633&id=6732

REVISION DETAIL
  https://phab.mercurial-scm.org/D2676

AFFECTED FILES
  contrib/python3-whitelist
  tests/test-merge-tools.t

CHANGE DETAILS




To: durin42, pulkit, #hg-reviewers
Cc: indygreg, mercurial-devel

Patch

diff --git a/tests/test-merge-tools.t b/tests/test-merge-tools.t
--- a/tests/test-merge-tools.t
+++ b/tests/test-merge-tools.t
@@ -1558,7 +1558,7 @@ 
   $ hg update -q -C 2
   $ hg merge -y -r tip --tool echo --config merge-tools.echo.args='$base $local $other $output'
   merging f and f.txt to f.txt
-  */f~base.?????? $TESTTMP/f.txt.orig */f~other.??????.txt $TESTTMP/f.txt (glob)
+  */f~base.* $TESTTMP/f.txt.orig */f~other.*.txt $TESTTMP/f.txt (glob)
   0 files updated, 1 files merged, 0 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
 
diff --git a/contrib/python3-whitelist b/contrib/python3-whitelist
--- a/contrib/python3-whitelist
+++ b/contrib/python3-whitelist
@@ -208,6 +208,7 @@ 
 test-merge-revert2.t
 test-merge-subrepos.t
 test-merge-symlinks.t
+test-merge-tools.t
 test-merge-types.t
 test-merge1.t
 test-merge10.t