Patchwork D5650: tests: normalize to bytes in test-install.t

login
register
mail settings
Submitter phabricator
Date Jan. 23, 2019, 5:50 a.m.
Message ID <b615feea6ad04db6a6da7dc76cbc21c5@localhost.localdomain>
Download mbox | patch
Permalink /patch/37923/
State Not Applicable
Headers show

Comments

phabricator - Jan. 23, 2019, 5:50 a.m.
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG6e54caaed08d: tests: normalize to bytes in test-install.t (authored by indygreg, committed by ).

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D5650?vs=13346&id=13362

REVISION DETAIL
  https://phab.mercurial-scm.org/D5650

AFFECTED FILES
  tests/test-install.t

CHANGE DETAILS




To: indygreg, #hg-reviewers
Cc: mercurial-devel

Patch

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 )