Mercurial > hg

changeset 35992:07cd54eae696

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test: glob the temporary directory out of temporary file path The temporary directory used by python might be outside of '/tmp/' (eg: /dev/shm/) so we glob that part out.
author Boris Feld <boris.feld@octobus.net>
date Fri, 09 Feb 2018 13:18:17 +0100
parents 04304b779df1
children a603a570cdbe
files tests/test-merge-tools.t
diffstat 1 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/tests/test-merge-tools.t	Fri Feb 09 12:48:12 2018 +0100
+++ b/tests/test-merge-tools.t	Fri Feb 09 13:18:17 2018 +0100
@@ -1358,7 +1358,7 @@
   arg: "ll:working copy"
   arg: "lo:"
   arg: "merge rev"
-  arg: "lb:base: /tmp/f~base.*" (glob)
+  arg: "lb:base: /*/f~base.*" (glob)
   0 files updated, 1 files merged, 0 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
   $ rm -f 'printargs_merge_tool'
@@ -1388,7 +1388,7 @@
   arg: "ll:working copy: tooltmpl ef83787e2614"
   arg: "lo:"
   arg: "merge rev: tooltmpl 0185f4e0cf02"
-  arg: "lb:base: /tmp/f~base.*" (glob)
+  arg: "lb:base: /*/f~base.*" (glob)
   0 files updated, 1 files merged, 0 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
   $ rm -f 'printargs_merge_tool'