python/tests/dns*: make use of dns.DNS_RCODE/dns.DNS_OPCODE

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>

diff --git a/python/samba/tests/dns_base.py b/python/samba/tests/dns_base.py
index 56c02dd6e511e6d71550db82072b20ef55ba56fc..ddd8b4efd1affa8153a74800ccb676a9d270f824 100644 (file)
--- a/python/samba/tests/dns_base.py
+++ b/python/samba/tests/dns_base.py
@@ -68,13 +68,13 @@ class DNSTest(TestCaseInTempDir):
 
     def assert_dns_rcode_equals(self, packet, rcode):
         "Helper function to check return code"
-        p_errcode = packet.operation & 0x000F
+        p_errcode = packet.operation & dns.DNS_RCODE
         self.assertEquals(p_errcode, rcode, "Expected RCODE %s, got %s" %
                           (self.errstr(rcode), self.errstr(p_errcode)))
 
     def assert_dns_opcode_equals(self, packet, opcode):
         "Helper function to check opcode"
-        p_opcode = packet.operation & 0x7800
+        p_opcode = packet.operation & dns.DNS_OPCODE
         self.assertEquals(p_opcode, opcode, "Expected OPCODE %s, got %s" %
                           (opcode, p_opcode))
 

diff --git a/python/samba/tests/dns_forwarder.py b/python/samba/tests/dns_forwarder.py
index 8178678e8859add30661f5d8ef39523235ab354c..65616898172e2bbf6237c6712b83d3f341eef565 100644 (file)
--- a/python/samba/tests/dns_forwarder.py
+++ b/python/samba/tests/dns_forwarder.py
@@ -81,13 +81,13 @@ class DNSTest(TestCase):
 
     def assert_dns_rcode_equals(self, packet, rcode):
         "Helper function to check return code"
-        p_errcode = packet.operation & 0x000F
+        p_errcode = packet.operation & dns.DNS_RCODE
         self.assertEquals(p_errcode, rcode, "Expected RCODE %s, got %s" %
                           (self.errcodes[rcode], self.errcodes[p_errcode]))
 
     def assert_dns_opcode_equals(self, packet, opcode):
         "Helper function to check opcode"
-        p_opcode = packet.operation & 0x7800
+        p_opcode = packet.operation & dns.DNS_OPCODE
         self.assertEquals(p_opcode, opcode, "Expected OPCODE %s, got %s" %
                           (opcode, p_opcode))