pytest: samba-tool dns: allow identical updates

We know this should work from tests of the underlying RPC calls on
Windows (see dns_aging).

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 10bc41f5745b7fec17d999662ca3b0ebe18d3906..a62c49e6a5f3c22132752beb270abd4d8a1670eb 100644 (file)
--- a/python/samba/tests/samba_tool/dnscmd.py
+++ b/python/samba/tests/samba_tool/dnscmd.py
@@ -378,10 +378,17 @@ class DnsCmdTestCase(SambaToolCmdTest):
                       "Errors above." % num_failures)
 
     def test_update_invalid_type(self):
+        """Make sure that a record can't be updated to another type leaving
+        the data the same, where that data would be incompatible with
+        the new type. This is not always enforced at the C level.
+
+        We don't try with all types, because many types are compatible
+        in their representations (e.g. A records could be TXT or CNAME
+        records; PTR record values are exactly the same as CNAME
+        record values, etc).
         """
-        Make sure that a record can't be updated to one of a different type.
-        """
-        for dnstype1 in self.good_records:
+        dnstypes = ('A', 'AAAA', 'SRV')
+        for dnstype1 in dnstypes:
             record1 = self.good_records[dnstype1][0]
             result, out, err = self.runsubcmd("dns", "add",
                                               os.environ["SERVER"],
@@ -392,24 +399,12 @@ class DnsCmdTestCase(SambaToolCmdTest):
                                   "record %s with type %s."
                                   % (record1, dnstype1))
 
-            for dnstype2 in self.good_records:
+            for dnstype2 in dnstypes:
                 if dnstype1 == dnstype2:
                     continue
 
                 record2 = self.good_records[dnstype2][0]
 
-                # Make sure that record2 isn't a valid entry of dnstype1.
-                # For example, any A-type will also be a valid TXT-type.
-                result, out, err = self.runsubcmd("dns", "add",
-                                                  os.environ["SERVER"],
-                                                  self.zone, "testrecord",
-                                                  dnstype1, record2,
-                                                  self.creds_string)
-                try:
-                    self.assertCmdFail(result)
-                except AssertionError:
-                    continue  # Don't check this one, because record2 _is_ a valid entry of dnstype1.
-
                 # Check both ways: Give the current type and try to update,
                 # and give the new type and try to update.
                 result, out, err = self.runsubcmd("dns", "update",
@@ -450,8 +445,9 @@ class DnsCmdTestCase(SambaToolCmdTest):
                                                   self.zone, "testrecord",
                                                   dnstype, record, record,
                                                   self.creds_string)
-                self.assertCmdFail(result, "Successfully updated record "
-                                   "'%s' to be exactly the same." % record)
+                self.assertCmdSuccess(result, out, err,
+                                      "Could not update record "
+                                      "'%s' to be exactly the same." % record)
 
                 result, out, err = self.runsubcmd("dns", "delete",
                                                   os.environ["SERVER"],

diff --git a/selftest/knownfail.d/dnscmd b/selftest/knownfail.d/dnscmd
new file mode 100644 (file)
index 0000000..95860d2
--- /dev/null
+++ b/selftest/knownfail.d/dnscmd
@@ -0,0 +1,2 @@
+samba.tests.samba_tool.dnscmd.+test_update_valid_type
+samba.tests.samba_tool.dnscmd.+test_update_invalid_type