diff options
| author | Bob Halley <halley@dnspython.org> | 2020-09-03 07:46:53 -0700 |
|---|---|---|
| committer | Bob Halley <halley@dnspython.org> | 2020-09-03 07:46:53 -0700 |
| commit | 78362aa6b9bce8f0942577c72773cb36c5050b92 (patch) | |
| tree | 180f8147ec43693d0e84852f762b4783e3741860 /tests/test_rrset.py | |
| parent | 1f1888d35b820f67f3bb9262427e8b64f44d62f8 (diff) | |
| download | dnspython-full_match.tar.gz | |
fix rrset match signature problemsfull_match
Diffstat (limited to 'tests/test_rrset.py')
| -rw-r--r-- | tests/test_rrset.py | 50 |
1 files changed, 31 insertions, 19 deletions
diff --git a/tests/test_rrset.py b/tests/test_rrset.py index 7835ba1..5c3f17d 100644 --- a/tests/test_rrset.py +++ b/tests/test_rrset.py @@ -79,42 +79,54 @@ class RRsetTestCase(unittest.TestCase): self.assertFalse(r1 is r2) self.assertTrue(r1 == r2) - def testMatch1(self): + def testFullMatch1(self): r1 = dns.rrset.from_text_list('foo', 30, 'in', 'a', ['10.0.0.1', '10.0.0.2']) - self.assertTrue(r1.match(r1.name, dns.rdataclass.IN, - dns.rdatatype.A, dns.rdatatype.NONE)) + self.assertTrue(r1.full_match(r1.name, dns.rdataclass.IN, + dns.rdatatype.A, dns.rdatatype.NONE)) - def testMatch2(self): + def testFullMatch2(self): r1 = dns.rrset.from_text_list('foo', 30, 'in', 'a', ['10.0.0.1', '10.0.0.2']) r1.deleting = dns.rdataclass.NONE - self.assertTrue(r1.match(r1.name, dns.rdataclass.IN, - dns.rdatatype.A, dns.rdatatype.NONE, - dns.rdataclass.NONE)) + self.assertTrue(r1.full_match(r1.name, dns.rdataclass.IN, + dns.rdatatype.A, dns.rdatatype.NONE, + dns.rdataclass.NONE)) - def testNoMatch1(self): + def testNoFullMatch1(self): n = dns.name.from_text('bar', None) r1 = dns.rrset.from_text_list('foo', 30, 'in', 'a', ['10.0.0.1', '10.0.0.2']) - self.assertFalse(r1.match(n, dns.rdataclass.IN, - dns.rdatatype.A, dns.rdatatype.NONE, - dns.rdataclass.ANY)) + self.assertFalse(r1.full_match(n, dns.rdataclass.IN, + dns.rdatatype.A, dns.rdatatype.NONE, + dns.rdataclass.ANY)) - def testNoMatch2(self): + def testNoFullMatch2(self): r1 = dns.rrset.from_text_list('foo', 30, 'in', 'a', ['10.0.0.1', '10.0.0.2']) r1.deleting = dns.rdataclass.NONE - self.assertFalse(r1.match(r1.name, dns.rdataclass.IN, - dns.rdatatype.A, dns.rdatatype.NONE, - dns.rdataclass.ANY)) + self.assertFalse(r1.full_match(r1.name, dns.rdataclass.IN, + dns.rdatatype.A, dns.rdatatype.NONE, + dns.rdataclass.ANY)) + + def testNoFullMatch3(self): + r1 = dns.rrset.from_text_list('foo', 30, 'in', 'a', + ['10.0.0.1', '10.0.0.2']) + self.assertFalse(r1.full_match(r1.name, dns.rdataclass.IN, + dns.rdatatype.MX, dns.rdatatype.NONE, + dns.rdataclass.ANY)) + + def testMatchCompatibilityWithFullMatch(self): + r1 = dns.rrset.from_text_list('foo', 30, 'in', 'a', + ['10.0.0.1', '10.0.0.2']) + self.assertTrue(r1.match(r1.name, dns.rdataclass.IN, + dns.rdatatype.A, dns.rdatatype.NONE)) - def testNoMatch3(self): + def testMatchCompatibilityWithRdatasetMatch(self): r1 = dns.rrset.from_text_list('foo', 30, 'in', 'a', ['10.0.0.1', '10.0.0.2']) - self.assertFalse(r1.match(r1.name, dns.rdataclass.IN, - dns.rdatatype.MX, dns.rdatatype.NONE, - dns.rdataclass.ANY)) + self.assertTrue(r1.match(dns.rdataclass.IN, dns.rdatatype.A, + dns.rdatatype.NONE)) def testToRdataset(self): r1 = dns.rrset.from_text_list('foo', 30, 'in', 'a', |