pytest: dns_aging: do not insist on non-aging timestamp updates

With Windows, when aging is off, the record timestamps are updated
anyway, but the timestamp change is not replicated.

We are not going to do it like that. With aging off, our records will
keep their first timestamp.

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

diff --git a/python/samba/tests/dns_aging.py b/python/samba/tests/dns_aging.py
index b9efb694447523d5a8ad36e4d3909113e7e9f182..2e7369bed00fa4f018ac3f68facc5dc6a4fbe9a6 100644 (file)
--- a/python/samba/tests/dns_aging.py
+++ b/python/samba/tests/dns_aging.py
@@ -2251,8 +2251,12 @@ class TestDNSAging(DNSTest):
 
         # check the B timestamp
         rec_b = self.get_unique_ip_record(name, B)
-
-        self.assert_soon_after(rec_b, now)
+        if not aging:
+            self.windows_variation(
+                self.assert_soon_after, rec_b, now,
+                msg="windows updates non-aging, samba does not")
+        else:
+            self.assert_soon_after(rec_b, now)
 
         # rewind B
         rec_b = self.add_ip_record(name, B, dwTimeStamp=b_initial)

diff --git a/selftest/knownfail.d/dns-aging b/selftest/knownfail.d/dns-aging
index 31c381efee1ce01f0c0ea55634c06a49b56e649b..f585449e1f9d2f7729247a3d32118c4adff5c7c8 100644 (file)
--- a/selftest/knownfail.d/dns-aging
+++ b/selftest/knownfail.d/dns-aging
@@ -72,17 +72,12 @@ samba.tests.dns_aging.+test_update_static_stickiness
 samba.tests.dns_aging.+test_update_timestamp_weirdness_no_refresh_no_aging
 samba.tests.dns_aging.+test_update_timestamp_weirdness_refresh_no_aging
 samba.tests.dns_aging.+test_AAAA_5_days_AAAA_6_days_aging
-samba.tests.dns_aging.+test_AAAA_5_days_AAAA_6_days_no_aging
 samba.tests.dns_aging.+test_A_10_days_AAAA_5_days_aging
 samba.tests.dns_aging.+test_A_10_days_AAAA_5_days_no_aging
 samba.tests.dns_aging.+test_A_10_days_AAAA_9_days_aging
 samba.tests.dns_aging.+test_A_20_days_AAAA_2_days_aging
 samba.tests.dns_aging.+test_A_5_days_AAAA_10_days_aging
-samba.tests.dns_aging.+test_A_5_days_AAAA_10_days_no_aging
 samba.tests.dns_aging.+test_A_5_days_AAAA_5_days_aging
-samba.tests.dns_aging.+test_A_5_days_AAAA_5_days_no_aging
-samba.tests.dns_aging.+test_A_5_days_A_10_days_no_aging
 samba.tests.dns_aging.+test_A_5_days_A_5_days_aging
-samba.tests.dns_aging.+test_A_6_days_AAAA_40_days_no_aging
 samba.tests.dns_aging.+test_A_9_days_AAAA_10_days_no_aging
 samba.tests.dns_aging.+test_samba_scavenging