Patchwork test: glob the temporary directory out of temporary file path

login
register
mail settings
Submitter Boris Feld
Date Feb. 9, 2018, 6:03 p.m.
Message ID <b74d05c795298bc42309.1518199417@FB>
Download mbox | patch
Permalink /patch/27514/
State Accepted
Headers show

Comments

Boris Feld - Feb. 9, 2018, 6:03 p.m.
# HG changeset patch
# User Boris Feld <boris.feld@octobus.net>
# Date 1518178697 -3600
#      Fri Feb 09 13:18:17 2018 +0100
# Node ID b74d05c795298bc4230950086cc5667a8845cd6c
# Parent  c64b9adfb371b6e9dfd2257d3e2f62d5121341df
# EXP-Topic test-tmpdir
# Available At https://bitbucket.org/octobus/mercurial-devel/
#              hg pull https://bitbucket.org/octobus/mercurial-devel/ -r b74d05c79529
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.
Yuya Nishihara - Feb. 10, 2018, 12:39 a.m.
On Fri, 09 Feb 2018 19:03:37 +0100, Boris Feld wrote:
> # HG changeset patch
> # User Boris Feld <boris.feld@octobus.net>
> # Date 1518178697 -3600
> #      Fri Feb 09 13:18:17 2018 +0100
> # Node ID b74d05c795298bc4230950086cc5667a8845cd6c
> # Parent  c64b9adfb371b6e9dfd2257d3e2f62d5121341df
> # EXP-Topic test-tmpdir
> # Available At https://bitbucket.org/octobus/mercurial-devel/
> #              hg pull https://bitbucket.org/octobus/mercurial-devel/ -r b74d05c79529
> test: glob the temporary directory out of temporary file path

Queued, thanks.

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
@@ -1358,7 +1358,7 @@  mergemarkertemplate settings:
   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 @@  mergemarkertemplate:
   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'