[1461] complete first test set

tests/lettuce/configurations/ddns/noddns.config.orig

@@ -1 +1 @@
-{"version": 2, "Logging": {"loggers": [{"debuglevel": 99, "severity": "DEBUG", "name": "*"}]}, "DDNS": {"zones": []}, "Auth": {"database_file": "data/ddns/example.org.sqlite3", "listen_on": [{"port": 47806, "address": "127.0.0.1"}]}, "Boss": {"components": {"b10-auth": {"kind": "needed", "special": "auth"}, "b10-cmdctl": {"kind": "needed", "special": "cmdctl"}}}}
+{"version": 2, "Logging": {"loggers": [{"severity": "DEBUG", "name": "*", "debuglevel": 99}]}, "DDNS": {"zones": []}, "Auth": {"database_file": "data/ddns/example.org.sqlite3", "listen_on": [{"port": 47806, "address": "127.0.0.1"}]}, "Boss": {"components": {"b10-xfrout": {"kind": "dispensable"}, "b10-auth": {"kind": "needed", "special": "auth"}, "b10-cmdctl": {"kind": "needed", "special": "cmdctl"}}}}

tests/lettuce/features/ddns_system.feature

@@ -48,28 +48,39 @@ Feature: DDNS System
         And the SOA serial for example.org should be 1237
 
         # Test 6
-        # XXX right after update, this fails?!
         When I send bind10 the command DDNS shutdown
 
         # Test 7
         And wait for new bind10 stderr message DDNS_RUNNING
 
         # Test 8
+        # Known issue: after shutdown, first new attempt results in SERVFAIL
+        When I use DDNS to set the SOA serial to 1238
+        The DDNS response should be SERVFAIL
+        And the SOA serial for example.org should be 1237
+
         When I use DDNS to set the SOA serial to 1238
         The DDNS response should be SUCCESS
         And the SOA serial for example.org should be 1238
 
         # Test 9
         When I send bind10 the command Auth shutdown
+        And wait for new bind10 stderr message AUTH_SERVER_STARTED
 
         # Test 10
+        When I use DDNS to set the SOA serial to 1239
+        The DDNS response should be SUCCESS
+        And the SOA serial for example.org should be 1239
+
+        # Test 11
         When I configure BIND10 to stop running DDNS
         And wait for new bind10 stderr message DDNS_STOPPED
 
         bind10 module DDNS should not be running
 
-        # Test 11
-        When I use DDNS to set the SOA serial to 1239
+        # Test 12
+        When I use DDNS to set the SOA serial to 1240
         # should this be REFUSED again?
         The DDNS response should be SERVFAIL
-        And the SOA serial for example.org should be 1238
+        And the SOA serial for example.org should be 1239
+

tests/lettuce/features/terrain/nsupdate.py

@@ -127,7 +127,7 @@ def set_serial_to(step, new_serial):
     which sets the SERIAL to the given value
     '''
     step.given('Prepare a DDNS update')
-    step.given('add to the DDNS update: update add example.org 3600 IN SOA ns1.example.org. admin.example.org. 1235 3600 1800 2419200 7200')
+    step.given('add to the DDNS update: update add example.org 3600 IN SOA ns1.example.org. admin.example.org. ' + new_serial + ' 3600 1800 2419200 7200')
     step.given('Run the DDNS update')
 
 @step('Configure BIND10 to run DDNS')
@@ -137,6 +137,7 @@ def configure_ddns_on(step):
         \"\"\"
         config add Boss/components b10-ddns
         config set Boss/components/b10-ddns/kind dispensable
+        config set Boss/components/b10-ddns/address DDNS
         config commit
         \"\"\"
     """)