Mercurial > hg
changeset 41621:0dc3ed4e712c
tests: replace match.match(exact=True) by match.exact()
Differential Revision: https://phab.mercurial-scm.org/D5918
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Fri, 08 Feb 2019 23:03:42 -0800 |
| parents | 74f53d3bd685 |
| children | 635a12c53ea6 |
| files | tests/test-manifest.py tests/test-match.py |
| diffstat | 2 files changed, 13 insertions(+), 17 deletions(-) [+] |
line wrap: on
line diff
--- a/tests/test-manifest.py Wed Feb 06 22:52:49 2019 -0800 +++ b/tests/test-manifest.py Fri Feb 08 23:03:42 2019 -0800 @@ -289,8 +289,8 @@ the resulting manifest.''' m = self.parsemanifest(A_HUGE_MANIFEST) - match = matchmod.match(b'/', b'', - [b'file1', b'file200', b'file300'], exact=True) + match = matchmod.exact(b'/', b'', + [b'file1', b'file200', b'file300']) m2 = m.matches(match) w = (b'file1\0%sx\n' @@ -304,10 +304,9 @@ ''' m = self.parsemanifest(A_DEEPER_MANIFEST) - match = matchmod.match(b'/', b'', + match = matchmod.exact(b'/', b'', [b'a/b/c/bar.txt', b'a/b/d/qux.py', - b'readme.txt', b'nonexistent'], - exact=True) + b'readme.txt', b'nonexistent']) m2 = m.matches(match) self.assertEqual( @@ -330,7 +329,7 @@ m = self.parsemanifest(A_HUGE_MANIFEST) flist = m.keys()[80:300] - match = matchmod.match(b'/', b'', flist, exact=True) + match = matchmod.exact(b'/', b'', flist) m2 = m.matches(match) self.assertEqual(flist, m2.keys()) @@ -364,7 +363,7 @@ against a directory.''' m = self.parsemanifest(A_DEEPER_MANIFEST) - match = matchmod.match(b'/', b'', [b'a/b'], exact=True) + match = matchmod.exact(b'/', b'', [b'a/b']) m2 = m.matches(match) self.assertEqual([], m2.keys())
--- a/tests/test-match.py Wed Feb 06 22:52:49 2019 -0800 +++ b/tests/test-match.py Fri Feb 08 23:03:42 2019 -0800 @@ -185,8 +185,7 @@ class ExactMatcherTests(unittest.TestCase): def testVisitdir(self): - m = matchmod.match(b'x', b'', patterns=[b'dir/subdir/foo.txt'], - exact=True) + m = matchmod.exact(b'x', b'', files=[b'dir/subdir/foo.txt']) assert isinstance(m, matchmod.exactmatcher) self.assertTrue(m.visitdir(b'.')) self.assertTrue(m.visitdir(b'dir')) @@ -197,8 +196,7 @@ self.assertFalse(m.visitdir(b'folder')) def testVisitchildrenset(self): - m = matchmod.match(b'x', b'', patterns=[b'dir/subdir/foo.txt'], - exact=True) + m = matchmod.exact(b'x', b'', files=[b'dir/subdir/foo.txt']) assert isinstance(m, matchmod.exactmatcher) self.assertEqual(m.visitchildrenset(b'.'), {b'dir'}) self.assertEqual(m.visitchildrenset(b'dir'), {b'subdir'}) @@ -208,12 +206,11 @@ self.assertEqual(m.visitchildrenset(b'folder'), set()) def testVisitchildrensetFilesAndDirs(self): - m = matchmod.match(b'x', b'', patterns=[b'rootfile.txt', - b'a/file1.txt', - b'a/b/file2.txt', - # no file in a/b/c - b'a/b/c/d/file4.txt'], - exact=True) + m = matchmod.exact(b'x', b'', files=[b'rootfile.txt', + b'a/file1.txt', + b'a/b/file2.txt', + # no file in a/b/c + b'a/b/c/d/file4.txt']) assert isinstance(m, matchmod.exactmatcher) self.assertEqual(m.visitchildrenset(b'.'), {b'a', b'rootfile.txt'}) self.assertEqual(m.visitchildrenset(b'a'), {b'b', b'file1.txt'})