D5650: tests: normalize to bytes in test-install.t
indygreg (Gregory Szorc)
phabricator at mercurial-scm.org
Wed Jan 23 02:45:38 UTC 2019
indygreg created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REVISION SUMMARY
directory() was returning str and hgdirectory() was returning
bytes. This made the set compare fail. Let's normalize the types
on Python 3 so the test passes.
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://phab.mercurial-scm.org/D5650
AFFECTED FILES
tests/test-install.t
CHANGE DETAILS
diff --git a/tests/test-install.t b/tests/test-install.t
--- a/tests/test-install.t
+++ b/tests/test-install.t
@@ -161,6 +161,7 @@
> import subprocess
> import sys
> import xml.etree.ElementTree as ET
+ > from mercurial import pycompat
>
> # MSYS mangles the path if it expands $TESTDIR
> testdir = os.environ['TESTDIR']
@@ -177,7 +178,7 @@
> files = node.findall('./{%(wix)s}Component/{%(wix)s}File' % ns)
>
> for f in files:
- > yield relpath + f.attrib['Name']
+ > yield pycompat.sysbytes(relpath + f.attrib['Name'])
>
> def hgdirectory(relpath):
> '''generator of tracked files, rooted at relpath'''
@@ -204,11 +205,11 @@
>
> print('Not installed:')
> for f in sorted(set(tracked) - set(installed)):
- > print(' %s' % f)
+ > print(' %s' % pycompat.sysstr(f))
>
> print('Not tracked:')
> for f in sorted(set(installed) - set(tracked)):
- > print(' %s' % f)
+ > print(' %s' % pycompat.sysstr(f))
> EOF
$ ( testrepohgenv; "$PYTHON" wixxml.py help )
To: indygreg, #hg-reviewers
Cc: mercurial-devel
More information about the Mercurial-devel
mailing list