D3473: tests: port test-walkrepo.py to Python 3
durin42 (Augie Fackler)
phabricator at mercurial-scm.org
Tue May 8 09:34:32 EDT 2018
This revision was automatically updated to reflect the committed changes.
Closed by commit rHGfa2423acb02f: tests: port test-walkrepo.py to Python 3 (authored by durin42, committed by ).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D3473?vs=8500&id=8528
REVISION DETAIL
https://phab.mercurial-scm.org/D3473
AFFECTED FILES
contrib/python3-whitelist
tests/test-walkrepo.py
CHANGE DETAILS
diff --git a/tests/test-walkrepo.py b/tests/test-walkrepo.py
--- a/tests/test-walkrepo.py
+++ b/tests/test-walkrepo.py
@@ -17,43 +17,43 @@
checklink = util.checklink
u = uimod.ui.load()
-sym = checklink('.')
+sym = checklink(b'.')
-hg.repository(u, 'top1', create=1)
-mkdir('subdir')
-chdir('subdir')
-hg.repository(u, 'sub1', create=1)
-mkdir('subsubdir')
-chdir('subsubdir')
-hg.repository(u, 'subsub1', create=1)
+hg.repository(u, b'top1', create=1)
+mkdir(b'subdir')
+chdir(b'subdir')
+hg.repository(u, b'sub1', create=1)
+mkdir(b'subsubdir')
+chdir(b'subsubdir')
+hg.repository(u, b'subsub1', create=1)
chdir(os.path.pardir)
if sym:
- os.symlink(os.path.pardir, 'circle')
- os.symlink(pjoin('subsubdir', 'subsub1'), 'subsub1')
+ os.symlink(os.path.pardir, b'circle')
+ os.symlink(pjoin(b'subsubdir', b'subsub1'), b'subsub1')
def runtest():
- reposet = frozenset(walkrepos('.', followsym=True))
+ reposet = frozenset(walkrepos(b'.', followsym=True))
if sym and (len(reposet) != 3):
print("reposet = %r" % (reposet,))
print(("Found %d repositories when I should have found 3"
% (len(reposet),)))
if (not sym) and (len(reposet) != 2):
print("reposet = %r" % (reposet,))
print(("Found %d repositories when I should have found 2"
% (len(reposet),)))
- sub1set = frozenset((pjoin('.', 'sub1'),
- pjoin('.', 'circle', 'subdir', 'sub1')))
+ sub1set = frozenset((pjoin(b'.', b'sub1'),
+ pjoin(b'.', b'circle', b'subdir', b'sub1')))
if len(sub1set & reposet) != 1:
print("sub1set = %r" % (sub1set,))
print("reposet = %r" % (reposet,))
print("sub1set and reposet should have exactly one path in common.")
- sub2set = frozenset((pjoin('.', 'subsub1'),
- pjoin('.', 'subsubdir', 'subsub1')))
+ sub2set = frozenset((pjoin(b'.', b'subsub1'),
+ pjoin(b'.', b'subsubdir', b'subsub1')))
if len(sub2set & reposet) != 1:
print("sub2set = %r" % (sub2set,))
print("reposet = %r" % (reposet,))
print("sub2set and reposet should have exactly one path in common.")
- sub3 = pjoin('.', 'circle', 'top1')
+ sub3 = pjoin(b'.', b'circle', b'top1')
if sym and sub3 not in reposet:
print("reposet = %r" % (reposet,))
print("Symbolic links are supported and %s is not in reposet" % (sub3,))
diff --git a/contrib/python3-whitelist b/contrib/python3-whitelist
--- a/contrib/python3-whitelist
+++ b/contrib/python3-whitelist
@@ -453,6 +453,7 @@
test-url.py
test-username-newline.t
test-verify.t
+test-walkrepo.py
test-websub.t
test-win32text.t
test-wireproto-clientreactor.py
To: durin42, pulkit, #hg-reviewers
Cc: mercurial-devel
More information about the Mercurial-devel
mailing list