Patchwork py3: fix test-propertycache.py on Windows

login
register
mail settings
Submitter Matt Harbison
Date Oct. 18, 2018, 3:56 a.m.
Message ID <7b9cf4dddf95b5964d3a.1539834998@Envy>
Download mbox | patch
Permalink /patch/36116/
State Accepted
Headers show

Comments

Matt Harbison - Oct. 18, 2018, 3:56 a.m.
# HG changeset patch
# User Matt Harbison <matt_harbison@yahoo.com>
# Date 1538099653 14400
#      Thu Sep 27 21:54:13 2018 -0400
# Node ID 7b9cf4dddf95b5964d3a05f65b9609b751f4334a
# Parent  b08be5625c0094a2fdd6cc00bec2a4dcdcc9ea75
py3: fix test-propertycache.py on Windows
Yuya Nishihara - Oct. 18, 2018, 12:55 p.m.
On Wed, 17 Oct 2018 23:56:38 -0400, Matt Harbison wrote:
> # HG changeset patch
> # User Matt Harbison <matt_harbison@yahoo.com>
> # Date 1538099653 14400
> #      Thu Sep 27 21:54:13 2018 -0400
> # Node ID 7b9cf4dddf95b5964d3a05f65b9609b751f4334a
> # Parent  b08be5625c0094a2fdd6cc00bec2a4dcdcc9ea75
> py3: fix test-propertycache.py on Windows

Queued, thanks.

Patch

diff --git a/tests/test-propertycache.py b/tests/test-propertycache.py
--- a/tests/test-propertycache.py
+++ b/tests/test-propertycache.py
@@ -16,6 +16,10 @@  from mercurial import (
     util,
 )
 
+from mercurial.utils import (
+    procutil,
+)
+
 # create some special property cache that trace they call
 
 calllog = []
@@ -46,7 +50,9 @@  localrepo.localrepository.testcachedunfi
 # Create an empty repo and instantiate it. It is important to run
 # these tests on the real object to detect regression.
 repopath = pycompat.fsencode(os.path.join(os.environ['TESTTMP'], 'repo'))
-assert subprocess.call(['hg', 'init', repopath]) == 0
+assert subprocess.call(pycompat.rapply(procutil.tonativestr,
+                                       [b'hg', b'init', repopath])) == 0
+
 ui = uimod.ui.load()
 repo = hg.repository(ui, path=repopath).unfiltered()