sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-07-31 20:22:15 +03:00
Code Activity

pytests: heed assertEquals deprecation warning en-masse

Browse Source 
TestCase.assertEquals() is an alias for TestCase.assertEqual() and
has been deprecated since Python 2.7.

When we run our tests with in python developer mode (`PYTHONDEVMODE=1
make test`) we get 580 DeprecationWarnings about this.

Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Noel Power <npower@samba.org>
This commit is contained in:
Douglas Bagnall
2020-02-07 11:02:38 +13:00
committed by Noel Power
parent 3bc7acc626
commit c247afbda0
129 changed files with 3795 additions and 3795 deletions
Download Patch File Download Diff File Expand all files Collapse all files

110
python/samba/tests/dns.py
View File

@ -94,8 +94,8 @@ class TestSimpleQueries(DNSTest):
self.dns_transaction_udp(p, host=server_ip)
self.assert_dns_rcode_equals(response, dns.DNS_RCODE_OK)
self.assert_dns_opcode_equals(response, dns.DNS_OPCODE_QUERY)
self.assertEquals(response.ancount, 1)
self.assertEquals(response.answers[0].rdata,
self.assertEqual(response.ancount, 1)
self.assertEqual(response.answers[0].rdata,
self.server_ip)
def test_one_SOA_query(self):
@ -113,8 +113,8 @@ class TestSimpleQueries(DNSTest):
self.dns_transaction_udp(p, host=server_ip)
self.assert_dns_rcode_equals(response, dns.DNS_RCODE_OK)
self.assert_dns_opcode_equals(response, dns.DNS_OPCODE_QUERY)
self.assertEquals(response.ancount, 1)
self.assertEquals(
self.assertEqual(response.ancount, 1)
self.assertEqual(
response.answers[0].rdata.mname.upper(),
("%s.%s" % (self.server, self.get_dns_domain())).upper())
@ -133,8 +133,8 @@ class TestSimpleQueries(DNSTest):
self.dns_transaction_tcp(p, host=server_ip)
self.assert_dns_rcode_equals(response, dns.DNS_RCODE_OK)
self.assert_dns_opcode_equals(response, dns.DNS_OPCODE_QUERY)
self.assertEquals(response.ancount, 1)
self.assertEquals(response.answers[0].rdata,
self.assertEqual(response.ancount, 1)
self.assertEqual(response.answers[0].rdata,
self.server_ip)
def test_one_mx_query(self):
@ -152,7 +152,7 @@ class TestSimpleQueries(DNSTest):
self.dns_transaction_udp(p, host=server_ip)
self.assert_dns_rcode_equals(response, dns.DNS_RCODE_OK)
self.assert_dns_opcode_equals(response, dns.DNS_OPCODE_QUERY)
self.assertEquals(response.ancount, 0)
self.assertEqual(response.ancount, 0)
p = self.make_name_packet(dns.DNS_OPCODE_QUERY)
questions = []
@ -167,7 +167,7 @@ class TestSimpleQueries(DNSTest):
self.dns_transaction_udp(p, host=server_ip)
self.assert_dns_rcode_equals(response, dns.DNS_RCODE_NXDOMAIN)
self.assert_dns_opcode_equals(response, dns.DNS_OPCODE_QUERY)
self.assertEquals(response.ancount, 0)
self.assertEqual(response.ancount, 0)
def test_two_queries(self):
"create a query packet containing two query records"
@ -215,11 +215,11 @@ class TestSimpleQueries(DNSTest):
self.assert_dns_rcode_equals(response, dns.DNS_RCODE_OK)
self.assert_dns_opcode_equals(response, dns.DNS_OPCODE_QUERY)
self.assertEquals(response.ancount, num_answers)
self.assertEquals(response.answers[0].rdata,
self.assertEqual(response.ancount, num_answers)
self.assertEqual(response.answers[0].rdata,
self.server_ip)
if dc_ipv6 is not None:
self.assertEquals(response.answers[1].rdata, dc_ipv6)
self.assertEqual(response.answers[1].rdata, dc_ipv6)
def test_qclass_none_query(self):
"create a QCLASS_NONE query"
@ -260,7 +260,7 @@ class TestSimpleQueries(DNSTest):
self.assert_dns_rcode_equals(response, dns.DNS_RCODE_OK)
self.assert_dns_opcode_equals(response, dns.DNS_OPCODE_QUERY)
# We don't get SOA records for single hosts
self.assertEquals(response.ancount, 0)
self.assertEqual(response.ancount, 0)
# But we do respond with an authority section
self.assertEqual(response.nscount, 1)
@ -279,7 +279,7 @@ class TestSimpleQueries(DNSTest):
self.assert_dns_rcode_equals(response, dns.DNS_RCODE_NXDOMAIN)
self.assert_dns_opcode_equals(response, dns.DNS_OPCODE_QUERY)
# We don't get SOA records for single hosts
self.assertEquals(response.ancount, 0)
self.assertEqual(response.ancount, 0)
# But we do respond with an authority section
self.assertEqual(response.nscount, 1)
@ -297,8 +297,8 @@ class TestSimpleQueries(DNSTest):
self.dns_transaction_udp(p, host=server_ip)
self.assert_dns_rcode_equals(response, dns.DNS_RCODE_OK)
self.assert_dns_opcode_equals(response, dns.DNS_OPCODE_QUERY)
self.assertEquals(response.ancount, 1)
self.assertEquals(response.answers[0].rdata.minimum, 3600)
self.assertEqual(response.ancount, 1)
self.assertEqual(response.answers[0].rdata.minimum, 3600)
class TestDNSUpdates(DNSTest):
@ -754,12 +754,12 @@ class TestComplexQueries(DNSTest):
self.dns_transaction_udp(p, host=self.server_ip)
self.assert_dns_rcode_equals(response, dns.DNS_RCODE_OK)
self.assert_dns_opcode_equals(response, dns.DNS_OPCODE_QUERY)
self.assertEquals(response.ancount, 2)
self.assertEquals(response.answers[0].rr_type, dns.DNS_QTYPE_CNAME)
self.assertEquals(response.answers[0].rdata, "%s.%s" %
self.assertEqual(response.ancount, 2)
self.assertEqual(response.answers[0].rr_type, dns.DNS_QTYPE_CNAME)
self.assertEqual(response.answers[0].rdata, "%s.%s" %
(self.server, self.get_dns_domain()))
self.assertEquals(response.answers[1].rr_type, dns.DNS_QTYPE_A)
self.assertEquals(response.answers[1].rdata,
self.assertEqual(response.answers[1].rr_type, dns.DNS_QTYPE_A)
self.assertEqual(response.answers[1].rdata,
self.server_ip)
finally:
@ -810,18 +810,18 @@ class TestComplexQueries(DNSTest):
self.dns_transaction_udp(p, host=server_ip)
self.assert_dns_rcode_equals(response, dns.DNS_RCODE_OK)
self.assert_dns_opcode_equals(response, dns.DNS_OPCODE_QUERY)
self.assertEquals(response.ancount, 3)
self.assertEqual(response.ancount, 3)
self.assertEquals(response.answers[0].rr_type, dns.DNS_QTYPE_CNAME)
self.assertEquals(response.answers[0].name, name1)
self.assertEquals(response.answers[0].rdata, name2)
self.assertEqual(response.answers[0].rr_type, dns.DNS_QTYPE_CNAME)
self.assertEqual(response.answers[0].name, name1)
self.assertEqual(response.answers[0].rdata, name2)
self.assertEquals(response.answers[1].rr_type, dns.DNS_QTYPE_CNAME)
self.assertEquals(response.answers[1].name, name2)
self.assertEquals(response.answers[1].rdata, name0)
self.assertEqual(response.answers[1].rr_type, dns.DNS_QTYPE_CNAME)
self.assertEqual(response.answers[1].name, name2)
self.assertEqual(response.answers[1].rdata, name0)
self.assertEquals(response.answers[2].rr_type, dns.DNS_QTYPE_A)
self.assertEquals(response.answers[2].rdata,
self.assertEqual(response.answers[2].rr_type, dns.DNS_QTYPE_A)
self.assertEqual(response.answers[2].rdata,
self.server_ip)
def test_invalid_empty_cname(self):
@ -855,15 +855,15 @@ class TestComplexQueries(DNSTest):
# CNAME should return all intermediate results!
# Only the A records exists, not the TXT.
self.assertEquals(response.ancount, 2)
self.assertEqual(response.ancount, 2)
self.assertEquals(response.answers[0].rr_type, dns.DNS_QTYPE_CNAME)
self.assertEquals(response.answers[0].name, name1)
self.assertEquals(response.answers[0].rdata, name2)
self.assertEqual(response.answers[0].rr_type, dns.DNS_QTYPE_CNAME)
self.assertEqual(response.answers[0].name, name1)
self.assertEqual(response.answers[0].rdata, name2)
self.assertEquals(response.answers[1].rr_type, dns.DNS_QTYPE_CNAME)
self.assertEquals(response.answers[1].name, name2)
self.assertEquals(response.answers[1].rdata, name0)
self.assertEqual(response.answers[1].rr_type, dns.DNS_QTYPE_CNAME)
self.assertEqual(response.answers[1].name, name2)
self.assertEqual(response.answers[1].rdata, name0)
def test_cname_loop(self):
cname1 = "cnamelooptestrec." + self.get_dns_domain()
@ -886,7 +886,7 @@ class TestComplexQueries(DNSTest):
self.dns_transaction_udp(p, host=self.server_ip)
max_recursion_depth = 20
self.assertEquals(len(response.answers), max_recursion_depth)
self.assertEqual(len(response.answers), max_recursion_depth)
# Make sure cname limit doesn't count other records. This is a generic
# test called in tests below
@ -1025,8 +1025,8 @@ class TestInvalidQueries(DNSTest):
self.dns_transaction_udp(p, host=self.server_ip)
self.assert_dns_rcode_equals(response, dns.DNS_RCODE_OK)
self.assert_dns_opcode_equals(response, dns.DNS_OPCODE_QUERY)
self.assertEquals(response.ancount, 1)
self.assertEquals(response.answers[0].rdata,
self.assertEqual(response.ancount, 1)
self.assertEqual(response.answers[0].rdata,
self.server_ip)
def test_one_a_reply(self):
@ -1054,7 +1054,7 @@ class TestInvalidQueries(DNSTest):
tcp_packet += send_packet
s.send(tcp_packet, 0)
recv_packet = s.recv(0xffff + 2, 0)
self.assertEquals(0, len(recv_packet))
self.assertEqual(0, len(recv_packet))
except socket.timeout:
# Windows chooses not to respond to incorrectly formatted queries.
# Although this appears to be non-deterministic even for the same
@ -1447,29 +1447,29 @@ class TestZones(DNSTest):
expr = "(dnsProperty:1.3.6.1.4.1.7165.4.5.3:=1)"
res = samdb.search(base=self.zone_dn, scope=ldb.SCOPE_SUBTREE,
expression=expr, attrs=["*"])
self.assertEquals(len(res), 0)
self.assertEqual(len(res), 0)
# No value for tombstone time
try:
expr = "(dnsRecord:1.3.6.1.4.1.7165.4.5.3:=)"
res = samdb.search(base=self.zone_dn, scope=ldb.SCOPE_SUBTREE,
expression=expr, attrs=["*"])
self.assertEquals(len(res), 0)
self.assertEqual(len(res), 0)
self.fail("Exception: ldb.ldbError not generated")
except ldb.LdbError as e:
(num, msg) = e.args
self.assertEquals(num, ERR_OPERATIONS_ERROR)
self.assertEqual(num, ERR_OPERATIONS_ERROR)
# Tombstone time = -
try:
expr = "(dnsRecord:1.3.6.1.4.1.7165.4.5.3:=-)"
res = samdb.search(base=self.zone_dn, scope=ldb.SCOPE_SUBTREE,
expression=expr, attrs=["*"])
self.assertEquals(len(res), 0)
self.assertEqual(len(res), 0)
self.fail("Exception: ldb.ldbError not generated")
except ldb.LdbError as e:
(num, _) = e.args
self.assertEquals(num, ERR_OPERATIONS_ERROR)
self.assertEqual(num, ERR_OPERATIONS_ERROR)
# Tombstone time longer than 64 characters
try:
@ -1477,22 +1477,22 @@ class TestZones(DNSTest):
expr = expr.format("1" * 65)
res = samdb.search(base=self.zone_dn, scope=ldb.SCOPE_SUBTREE,
expression=expr, attrs=["*"])
self.assertEquals(len(res), 0)
self.assertEqual(len(res), 0)
self.fail("Exception: ldb.ldbError not generated")
except ldb.LdbError as e:
(num, _) = e.args
self.assertEquals(num, ERR_OPERATIONS_ERROR)
self.assertEqual(num, ERR_OPERATIONS_ERROR)
# Non numeric Tombstone time
try:
expr = "(dnsRecord:1.3.6.1.4.1.7165.4.5.3:=expired)"
res = samdb.search(base=self.zone_dn, scope=ldb.SCOPE_SUBTREE,
expression=expr, attrs=["*"])
self.assertEquals(len(res), 0)
self.assertEqual(len(res), 0)
self.fail("Exception: ldb.ldbError not generated")
except ldb.LdbError as e:
(num, _) = e.args
self.assertEquals(num, ERR_OPERATIONS_ERROR)
self.assertEqual(num, ERR_OPERATIONS_ERROR)
# Non system session
try:
@ -1503,11 +1503,11 @@ class TestZones(DNSTest):
expr = "(dnsRecord:1.3.6.1.4.1.7165.4.5.3:=2)"
res = db.search(base=self.zone_dn, scope=ldb.SCOPE_SUBTREE,
expression=expr, attrs=["*"])
self.assertEquals(len(res), 0)
self.assertEqual(len(res), 0)
self.fail("Exception: ldb.ldbError not generated")
except ldb.LdbError as e:
(num, _) = e.args
self.assertEquals(num, ERR_OPERATIONS_ERROR)
self.assertEqual(num, ERR_OPERATIONS_ERROR)
def test_basic_scavenging(self):
lp = self.get_loadparm()
@ -1685,22 +1685,22 @@ class TestZones(DNSTest):
# Windows returns OK while BIND logically seems to return NXDOMAIN
self.assert_dns_rcode_equals(response, dns.DNS_RCODE_NXDOMAIN)
self.assert_dns_opcode_equals(response, dns.DNS_OPCODE_QUERY)
self.assertEquals(response.ancount, 0)
self.assertEqual(response.ancount, 0)
self.create_zone(zone)
(response, response_packet) =\
self.dns_transaction_udp(p, host=server_ip)
self.assert_dns_rcode_equals(response, dns.DNS_RCODE_OK)
self.assert_dns_opcode_equals(response, dns.DNS_OPCODE_QUERY)
self.assertEquals(response.ancount, 1)
self.assertEquals(response.answers[0].rr_type, dns.DNS_QTYPE_SOA)
self.assertEqual(response.ancount, 1)
self.assertEqual(response.answers[0].rr_type, dns.DNS_QTYPE_SOA)
self.delete_zone(zone)
(response, response_packet) =\
self.dns_transaction_udp(p, host=server_ip)
self.assert_dns_rcode_equals(response, dns.DNS_RCODE_NXDOMAIN)
self.assert_dns_opcode_equals(response, dns.DNS_OPCODE_QUERY)
self.assertEquals(response.ancount, 0)
self.assertEqual(response.ancount, 0)
class TestRPCRoundtrip(DNSTest):