tests-extra: catalog/expire -- speed up the test

diff --git a/tests-extra/tests/catalog/expire/data/catalog1.zone b/tests-extra/tests/catalog/expire/data/catalog1.zone
index e334ddbc8879b4bbe93a60d8746751cbc0d1229d..81f5747b2617841893bfbacae4febbd089e2cc02 100644 (file)
--- a/tests-extra/tests/catalog/expire/data/catalog1.zone
+++ b/tests-extra/tests/catalog/expire/data/catalog1.zone
@@ -1,7 +1,7 @@
 $ORIGIN catalog1.
 $TTL 0
 
-@ SOA ns admin 1 2 2 8 600
+@ SOA ns admin 1 1 1 3 600
   NS ns
 ns AAAA ::0
 version TXT "2"

diff --git a/tests-extra/tests/catalog/expire/data/cataloged1.zone b/tests-extra/tests/catalog/expire/data/cataloged1.zone
index 0d563b2891bcd27d3c05371530dc1b9bd15e1517..3a73de319f90c87a18200edcd7d0b74d0e183f4c 100644 (file)
--- a/tests-extra/tests/catalog/expire/data/cataloged1.zone
+++ b/tests-extra/tests/catalog/expire/data/cataloged1.zone
@@ -1,6 +1,6 @@
 $ORIGIN cataloged1.
 $TTL 1200
 
-@ SOA ns admin 10001 5 5 15 600
+@ SOA ns admin 10001 4 4 8 600
   NS ns
 ns AAAA ::0

diff --git a/tests-extra/tests/catalog/expire/test.py b/tests-extra/tests/catalog/expire/test.py
index 2fa5b87e7cffeabf087a71bc889d16974977cfdb..524be4b9939a4e605de64f80893d04cb4fe68714 100644 (file)
--- a/tests-extra/tests/catalog/expire/test.py
+++ b/tests-extra/tests/catalog/expire/test.py
@@ -32,20 +32,21 @@ slave.zones_wait(members)
 master.stop() # even regular answers must be blocked (to prevent refresh)
 
 # Check non-expiration of catalog.
-t.sleep(10)  # greater than the SOA expire
+t.sleep(4)  # greater than the SOA expire
 resp = slave.dig("catalog1.", "SOA", udp=False, tsig=True)
 resp.check(rcode="NOERROR")
 resp = slave.dig("cataloged1.", "SOA", udp=False, tsig=True)
 resp.check(rcode="NOERROR")
 
 # Check regular expiration of member zones.
-t.sleep(7)  # together with previous sleep greater than members expire
+t.sleep(5)  # together with previous sleep greater than members expire
 resp = slave.dig("catalog1.", "SOA", udp=False, tsig=True)
 resp.check(rcode="NOERROR")
 resp = slave.dig("cataloged1.", "SOA", udp=False, tsig=True)
 resp.check(rcode="SERVFAIL")
 
 master.start()
+slave.ctl("zone-refresh") # don't waste time waiting for member bootstrap
 slave.zones_wait(members)
 
 # Check manual expiration of catalog.