python:tests/dns_tkey: let test_update_tsig_windows() actually pass against windows...

BUG: https://bugzilla.samba.org/show_bug.cgi?id=13019

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
(cherry picked from commit 848318338b2972f331e067bf1c8d6c7dac0748c8)

diff --git a/python/samba/tests/dns_tkey.py b/python/samba/tests/dns_tkey.py
index e77aa4088a64a6a85aee9ccb66dcf7c807665c17..a88c30a6754f4897fb0f6865026477d36b099db0 100644 (file)
--- a/python/samba/tests/dns_tkey.py
+++ b/python/samba/tests/dns_tkey.py
@@ -331,35 +331,28 @@ class TestDNSUpdates(DNSTKeyTest):
     def test_update_tsig_windows(self):
         "test DNS update with correct TSIG record (follow Windows pattern)"
 
-        newrecname = "win" + self.newrecname
+        p = self.make_update_request()
+
         rr_class = dns.DNS_QCLASS_IN
         ttl = 1200
 
-        p = self.make_name_packet(dns.DNS_OPCODE_UPDATE)
-        q = self.make_name_question(self.get_dns_domain(),
-                                    dns.DNS_QTYPE_SOA,
-                                    dns.DNS_QCLASS_IN)
-        questions = []
-        questions.append(q)
-        self.finish_name_packet(p, questions)
-
         updates = []
         r = dns.res_rec()
-        r.name = newrecname
+        r.name = self.newrecname
         r.rr_type = dns.DNS_QTYPE_A
         r.rr_class = dns.DNS_QCLASS_ANY
         r.ttl = 0
         r.length = 0
         updates.append(r)
         r = dns.res_rec()
-        r.name = newrecname
+        r.name = self.newrecname
         r.rr_type = dns.DNS_QTYPE_AAAA
         r.rr_class = dns.DNS_QCLASS_ANY
         r.ttl = 0
         r.length = 0
         updates.append(r)
         r = dns.res_rec()
-        r.name = newrecname
+        r.name = self.newrecname
         r.rr_type = dns.DNS_QTYPE_A
         r.rr_class = rr_class
         r.ttl = ttl
@@ -371,7 +364,7 @@ class TestDNSUpdates(DNSTKeyTest):
 
         prereqs = []
         r = dns.res_rec()
-        r.name = newrecname
+        r.name = self.newrecname
         r.rr_type = dns.DNS_QTYPE_CNAME
         r.rr_class = dns.DNS_QCLASS_NONE
         r.ttl = 0
@@ -390,11 +383,22 @@ class TestDNSUpdates(DNSTKeyTest):
         self.verify_packet(response, response_p, mac)
 
         # Check the record is around
-        rcode = self.search_record(newrecname)
+        rcode = self.search_record(self.newrecname)
         self.assert_rcode_equals(rcode, dns.DNS_RCODE_OK)
 
         # Now delete the record
+        delete_updates = []
+        r = dns.res_rec()
+        r.name = self.newrecname
+        r.rr_type = dns.DNS_QTYPE_A
+        r.rr_class = dns.DNS_QCLASS_NONE
+        r.ttl = 0
+        r.length = 0xffff
+        r.rdata = "10.1.45.64"
+        delete_updates.append(r)
         p = self.make_update_request(delete=True)
+        p.nscount = len(delete_updates)
+        p.nsrecs = delete_updates
         mac = self.sign_packet(p, self.tkey['name'])
         (response, response_p) = self.dns_transaction_udp(p, self.server_ip)
         self.assert_dns_rcode_equals(response, dns.DNS_RCODE_OK)

diff --git a/selftest/knownfail.d/dns_tkey b/selftest/knownfail.d/dns_tkey
index 19fe5c8bde3a16b4ac1240187c46e70e6c998c2d..30dbcb2bff6107f536ab3770a920c05916f54507 100644 (file)
--- a/selftest/knownfail.d/dns_tkey
+++ b/selftest/knownfail.d/dns_tkey
@@ -11,3 +11,4 @@
 ^samba.tests.dns_tkey.__main__.TestDNSUpdates.test_update_tsig_changed_algorithm2.fl2008r2dc
 ^samba.tests.dns_tkey.__main__.TestDNSUpdates.test_update_gss_tsig_tkey_req_additional.fl2008r2dc
 ^samba.tests.dns_tkey.__main__.TestDNSUpdates.test_update_tsig_windows.fl2008r2dc
+^samba.tests.dns_tkey.__main__.TestDNSUpdates.test_update_wo_tsig.fl2008r2dc