From: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Date: Thu, 17 Jun 2021 10:22:46 +0000 (+1200)
Subject: pytest: samba-tool dns: allow valid updates
X-Git-Tag: tevent-0.11.0~259
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b2453a0f5c2fbb0c002ebb5fd274ca57ff66ee9f;p=thirdparty%2Fsamba.git

pytest: samba-tool dns: allow valid updates

Without this patch we will get errors like this when in-place RPC
updates start to work:

   AssertionError: unexpectedly None : Successfully updated record
   '192.168.0.1' to '192.168.0.1', even though the latter is of type
   'A' where 'A' was expected.

That's because we have always rejected updates that try to modify an
existing record. We shouldn't.

Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
---

diff --git a/python/samba/tests/samba_tool/dnscmd.py b/python/samba/tests/samba_tool/dnscmd.py
index 6b9e7bb1c67..10bc41f5745 100644
--- a/python/samba/tests/samba_tool/dnscmd.py
+++ b/python/samba/tests/samba_tool/dnscmd.py
@@ -393,6 +393,9 @@ class DnsCmdTestCase(SambaToolCmdTest):
                                   % (record1, dnstype1))
 
             for dnstype2 in self.good_records:
+                if dnstype1 == dnstype2:
+                    continue
+
                 record2 = self.good_records[dnstype2][0]
 
                 # Make sure that record2 isn't a valid entry of dnstype1.