Mercurial > hg

changeset 41530:4dd07bf84608

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests: fix test-match.py on Python3 # skip-blame just b prefixes Differential Revision: https://phab.mercurial-scm.org/D5835
author Augie Fackler <augie@google.com>
date Mon, 04 Feb 2019 17:06:22 -0500
parents 13a6dd952ffe
children 14983ac4a764
files tests/test-match.py
diffstat 1 files changed, 10 insertions(+), 10 deletions(-) [+]
line wrap: on
line diff
--- a/tests/test-match.py	Mon Feb 04 20:35:21 2019 +0300
+++ b/tests/test-match.py	Mon Feb 04 17:06:22 2019 -0500
@@ -261,13 +261,13 @@
         # assertTrue does NOT verify that it's a bool, just that it's truthy.
         # While we may want to eventually make these return 'all', they should
         # not currently do so.
-        self.assertEqual(dm.visitdir(b'.'), 'all')
-        self.assertEqual(dm.visitdir(b'dir'), 'all')
-        self.assertEqual(dm.visitdir(b'dir/subdir'), 'all')
-        self.assertEqual(dm.visitdir(b'dir/subdir/z'), 'all')
-        self.assertEqual(dm.visitdir(b'dir/foo'), 'all')
-        self.assertEqual(dm.visitdir(b'dir/subdir/x'), 'all')
-        self.assertEqual(dm.visitdir(b'folder'), 'all')
+        self.assertEqual(dm.visitdir(b'.'), b'all')
+        self.assertEqual(dm.visitdir(b'dir'), b'all')
+        self.assertEqual(dm.visitdir(b'dir/subdir'), b'all')
+        self.assertEqual(dm.visitdir(b'dir/subdir/z'), b'all')
+        self.assertEqual(dm.visitdir(b'dir/foo'), b'all')
+        self.assertEqual(dm.visitdir(b'dir/subdir/x'), b'all')
+        self.assertEqual(dm.visitdir(b'folder'), b'all')
 
     def testVisitchildrensetM2never(self):
         m1 = matchmod.alwaysmatcher(b'', b'')
@@ -294,8 +294,8 @@
         # an 'all' pattern, just True.
         self.assertEqual(dm.visitdir(b'dir/subdir/z'), True)
         self.assertEqual(dm.visitdir(b'dir/subdir/x'), True)
-        self.assertEqual(dm.visitdir(b'dir/foo'), 'all')
-        self.assertEqual(dm.visitdir(b'folder'), 'all')
+        self.assertEqual(dm.visitdir(b'dir/foo'), b'all')
+        self.assertEqual(dm.visitdir(b'folder'), b'all')
 
     def testVisitchildrensetM2SubdirPrefix(self):
         m1 = matchmod.alwaysmatcher(b'', b'')
@@ -320,7 +320,7 @@
         dm = matchmod.differencematcher(m1, m2)
         self.assertEqual(dm.visitdir(b'.'), True)
         self.assertEqual(dm.visitdir(b'dir'), True)
-        self.assertEqual(dm.visitdir(b'dir/subdir'), 'all')
+        self.assertEqual(dm.visitdir(b'dir/subdir'), b'all')
         self.assertFalse(dm.visitdir(b'dir/foo'))
         self.assertFalse(dm.visitdir(b'folder'))
         # OPT: We should probably return False for these; we don't because