Mercurial > hg
changeset 41318:6e54caaed08d
tests: normalize to bytes in test-install.t
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.
Differential Revision: https://phab.mercurial-scm.org/D5650
| author | Gregory Szorc <gregory.szorc@gmail.com> |
|---|---|
| date | Tue, 22 Jan 2019 17:50:52 -0800 |
| parents | 4ad002b2584d |
| children | 46781c1b5049 |
| files | tests/test-install.t |
| diffstat | 1 files changed, 4 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/tests/test-install.t Tue Jan 22 17:08:53 2019 -0800 +++ b/tests/test-install.t Tue Jan 22 17:50:52 2019 -0800 @@ -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 )