# HG changeset patch # User Boris Feld # Date 1518178697 -3600 # Node ID 07cd54eae696bb85f4d50d674f8e32056708559b # Parent 04304b779df1251a4e6a6711fa52e40b88b86573 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. diff -r 04304b779df1 -r 07cd54eae696 tests/test-merge-tools.t --- 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'