diff options
Diffstat (limited to 'source4/torture/drs/python/samba_tool_drs_showrepl.py')
| -rw-r--r-- | source4/torture/drs/python/samba_tool_drs_showrepl.py | 46 |
1 files changed, 23 insertions, 23 deletions
diff --git a/source4/torture/drs/python/samba_tool_drs_showrepl.py b/source4/torture/drs/python/samba_tool_drs_showrepl.py index 8ed1fa0fcc7..de7f89336e3 100644 --- a/source4/torture/drs/python/samba_tool_drs_showrepl.py +++ b/source4/torture/drs/python/samba_tool_drs_showrepl.py @@ -78,12 +78,12 @@ class SambaToolDrsShowReplTests(drs_base.DrsBaseTestCase): self.assertEqual(_outbound, ' OUTBOUND NEIGHBORS ') self.assertEqual(_conn, ' KCC CONNECTION OBJECTS ') - self.assertRegexpMatches(header, - r'^Default-First-Site-Name\\LOCALDC\s+' - r"DSA Options: %s\s+" - r"DSA object GUID: %s\s+" - r"DSA invocationId: %s" % - (HEX8_RE, GUID_RE, GUID_RE)) + self.assertRegex(header, + r'^Default-First-Site-Name\\LOCALDC\s+' + r"DSA Options: %s\s+" + r"DSA object GUID: %s\s+" + r"DSA invocationId: %s" % + (HEX8_RE, GUID_RE, GUID_RE)) # We don't assert the DomainDnsZones and ForestDnsZones are # there because we don't know that they have been set up yet. @@ -91,7 +91,7 @@ class SambaToolDrsShowReplTests(drs_base.DrsBaseTestCase): for p in ['CN=Configuration,DC=samba,DC=example,DC=com', 'DC=samba,DC=example,DC=com', 'CN=Schema,CN=Configuration,DC=samba,DC=example,DC=com']: - self.assertRegexpMatches( + self.assertRegex( inbound, r'%s\n' r'\tDefault-First-Site-Name\\[A-Z]+ via RPC\n' @@ -102,7 +102,7 @@ class SambaToolDrsShowReplTests(drs_base.DrsBaseTestCase): r'\n' % (p, GUID_RE), msg="%s inbound missing" % p) - self.assertRegexpMatches( + self.assertRegex( outbound, r'%s\n' r'\tDefault-First-Site-Name\\[A-Z]+ via RPC\n' @@ -113,13 +113,13 @@ class SambaToolDrsShowReplTests(drs_base.DrsBaseTestCase): r'\n' % (p, GUID_RE), msg="%s outbound missing" % p) - self.assertRegexpMatches(conn, - r'Connection --\n' - r'\tConnection name: %s\n' - r'\tEnabled : TRUE\n' - r'\tServer DNS name : \w+.samba.example.com\n' - r'\tServer DN name : %s' - r'\n' % (GUID_RE, DN_RE)) + self.assertRegex(conn, + r'Connection --\n' + r'\tConnection name: %s\n' + r'\tEnabled : TRUE\n' + r'\tServer DNS name : \w+.samba.example.com\n' + r'\tServer DN name : %s' + r'\n' % (GUID_RE, DN_RE)) def test_samba_tool_showrepl_json(self): """Tests 'samba-tool drs showrepl --json' command. @@ -134,30 +134,30 @@ class SambaToolDrsShowReplTests(drs_base.DrsBaseTestCase): # dsa for k in ["objectGUID", "invocationId"]: - self.assertRegexpMatches(d['dsa'][k], '^%s$' % GUID_RE) + self.assertRegex(d['dsa'][k], '^%s$' % GUID_RE) self.assertTrue(isinstance(d['dsa']["options"], int)) # repsfrom and repsto for reps in (d['repsFrom'], d['repsTo']): for r in reps: for k in ('NC dn', "NTDS DN"): - self.assertRegexpMatches(r[k], '^%s$' % DN_RE) + self.assertRegex(r[k], '^%s$' % DN_RE) for k in ("last attempt time", "last attempt message", "last success"): self.assertTrue(isinstance(r[k], str)) - self.assertRegexpMatches(r["DSA objectGUID"], '^%s$' % GUID_RE) + self.assertRegex(r["DSA objectGUID"], '^%s$' % GUID_RE) self.assertTrue(isinstance(r["consecutive failures"], int)) # ntdsconnection for n in d["NTDSConnections"]: - self.assertRegexpMatches(n["dns name"], - r'^[\w]+\.samba\.example\.com$') - self.assertRegexpMatches(n["name"], "^%s$" % GUID_RE) + self.assertRegex(n["dns name"], + r'^[\w]+\.samba\.example\.com$') + self.assertRegex(n["name"], "^%s$" % GUID_RE) self.assertTrue(isinstance(n['enabled'], bool)) self.assertTrue(isinstance(n['options'], int)) self.assertTrue(isinstance(n['replicates NC'], list)) - self.assertRegexpMatches(n["remote DN"], "^%s$" % DN_RE) + self.assertRegex(n["remote DN"], "^%s$" % DN_RE) def _force_all_reps(self, samdb, dc, direction): if direction == 'inbound': @@ -354,7 +354,7 @@ class SambaToolDrsShowReplTests(drs_base.DrsBaseTestCase): e.returncode, e.msg, e.cmd)) - self.assertRegexpMatches( + self.assertRegex( e_stdout, r'result 845[67] ' r'\(WERR_DS_DRA_(SINK|SOURCE)_DISABLED\)', |