summaryrefslogtreecommitdiffstats
path: root/tests-extra
diff options
context:
space:
mode:
authorJan Vcelak <jv@fcelda.cz>2017-01-15 22:01:22 +0100
committerJan Vcelak <jv@fcelda.cz>2017-01-15 22:01:32 +0100
commit8b965d3cee55ab73cb9e6a23392a32efaf1b576e (patch)
tree958fddf53bf968c1668e9733fc5c2c014f0e718d /tests-extra
parentreplan: cancel expire before updating the timer (diff)
downloadknot-8b965d3cee55ab73cb9e6a23392a32efaf1b576e.tar.xz
knot-8b965d3cee55ab73cb9e6a23392a32efaf1b576e.zip
tests: adjust timing in events/soa
Diffstat (limited to 'tests-extra')
-rw-r--r--tests-extra/tests/events/soa/data/example.zone2
-rw-r--r--tests-extra/tests/events/soa/data/example.zone.12
-rw-r--r--tests-extra/tests/events/soa/data/example.zone.22
-rw-r--r--tests-extra/tests/events/soa/test.py11
4 files changed, 7 insertions, 10 deletions
diff --git a/tests-extra/tests/events/soa/data/example.zone b/tests-extra/tests/events/soa/data/example.zone
index 026344f83..3baeeda58 100644
--- a/tests-extra/tests/events/soa/data/example.zone
+++ b/tests-extra/tests/events/soa/data/example.zone
@@ -1,7 +1,7 @@
$ORIGIN example.
$TTL 3600
-@ SOA dns1 hostmaster 1 1 1 3 600
+@ SOA dns1 hostmaster 1 1 1 10 600
NS dns1
dns1 A 192.0.2.1
diff --git a/tests-extra/tests/events/soa/data/example.zone.1 b/tests-extra/tests/events/soa/data/example.zone.1
index a19a5cd2d..014c38450 100644
--- a/tests-extra/tests/events/soa/data/example.zone.1
+++ b/tests-extra/tests/events/soa/data/example.zone.1
@@ -1,7 +1,7 @@
$ORIGIN example.
$TTL 3600
-@ SOA dns1 hostmaster 2 10 1 3 600
+@ SOA dns1 hostmaster 2 20 1 10 600
NS dns1
dns1 A 192.0.2.1
diff --git a/tests-extra/tests/events/soa/data/example.zone.2 b/tests-extra/tests/events/soa/data/example.zone.2
index 79e6d7b83..0a2c0b6a1 100644
--- a/tests-extra/tests/events/soa/data/example.zone.2
+++ b/tests-extra/tests/events/soa/data/example.zone.2
@@ -1,7 +1,7 @@
$ORIGIN example.
$TTL 3600
-@ SOA dns1 hostmaster 3 1 10 3 600
+@ SOA dns1 hostmaster 3 1 20 10 600
NS dns1
dns1 A 192.0.2.1
diff --git a/tests-extra/tests/events/soa/test.py b/tests-extra/tests/events/soa/test.py
index 0389b1b06..198cd429c 100644
--- a/tests-extra/tests/events/soa/test.py
+++ b/tests-extra/tests/events/soa/test.py
@@ -6,7 +6,7 @@ from dnstest.utils import *
from dnstest.test import Test
import random
-EXPIRE_SLEEP = 5
+EXPIRE_SLEEP = 15
def test_ok(slave):
resp = slave.dig("example.", "SOA")
@@ -61,19 +61,16 @@ def test_run_case(t, master, slave, action):
def test_run(t, servers, zone, action):
master, slave = servers
- check_log("ZONE SOA TIMERS: REFRESH = 1, RETRY = 1, EXPIRE = 3")
- check_log("===================================================")
+ check_log("ZONE SOA TIMERS: REFRESH = 1, RETRY = 1, EXPIRE = 10")
init_servers(master, slave)
test_run_case(t, master, slave, action)
- check_log("ZONE SOA TIMERS: REFRESH = 10, RETRY = 1, EXPIRE = 3")
- check_log("====================================================")
+ check_log("ZONE SOA TIMERS: REFRESH = 20, RETRY = 1, EXPIRE = 10")
master.update_zonefile(zone, version=1)
init_servers(master, slave)
test_run_case(t, master, slave, action)
- check_log("ZONE SOA TIMERS: REFRESH = 1, RETRY = 10, EXPIRE = 3")
- check_log("====================================================")
+ check_log("ZONE SOA TIMERS: REFRESH = 1, RETRY = 20, EXPIRE = 10")
master.update_zonefile(zone, version=2)
init_servers(master, slave)
test_run_case(t, master, slave, action)