Browse Source

[1461] move start/stop ddns steps to bind10_control.py

Jelte Jansen 13 years ago
parent
commit
c54635af61

+ 0 - 1
tests/lettuce/features/example.feature

@@ -191,4 +191,3 @@ Feature: Example feature
 
         A query for www.example.org to 127.0.0.1:47806 should have rcode REFUSED
         A query for www.example.org to [::1]:47807 should have rcode NOERROR
-

+ 29 - 0
tests/lettuce/features/terrain/bind10_control.py

@@ -334,3 +334,32 @@ def module_is_running(step, name, not_str):
         not_str = ""
     step.given('send bind10 the command help')
     step.given('last bindctl output should' + not_str + ' contain ' + name + ' exactly')
+
+@step('Configure BIND10 to run DDNS')
+def configure_ddns_on(step):
+    """
+    Convenience compound step to enable the b10-ddns module.
+    """
+    step.behave_as("""
+    When I send bind10 the following commands
+        \"\"\"
+        config add Boss/components b10-ddns
+        config set Boss/components/b10-ddns/kind dispensable
+        config set Boss/components/b10-ddns/address DDNS
+        config commit
+        \"\"\"
+    """)
+
+@step('Configure BIND10 to stop running DDNS')
+def configure_ddns_off(step):
+    """
+    Convenience compound step to disable the b10-ddns module.
+    """
+    step.behave_as("""
+    When I send bind10 the following commands
+        \"\"\"
+        config remove Boss/components b10-ddns
+        config commit
+        \"\"\"
+    """)
+

+ 0 - 28
tests/lettuce/features/terrain/nsupdate.py

@@ -134,34 +134,6 @@ def run_ddns_update(step):
     """
     run_nsupdate(world.nsupdate_commands)
 
-@step('Configure BIND10 to run DDNS')
-def configure_ddns_on(step):
-    """
-    Convenience compound step to enable the b10-ddns module.
-    """
-    step.behave_as("""
-    When I send bind10 the following commands
-        \"\"\"
-        config add Boss/components b10-ddns
-        config set Boss/components/b10-ddns/kind dispensable
-        config set Boss/components/b10-ddns/address DDNS
-        config commit
-        \"\"\"
-    """)
-
-@step('Configure BIND10 to stop running DDNS')
-def configure_ddns_off(step):
-    """
-    Convenience compound step to disable the b10-ddns module.
-    """
-    step.behave_as("""
-    When I send bind10 the following commands
-        \"\"\"
-        config remove Boss/components b10-ddns
-        config commit
-        \"\"\"
-    """)
-
 @step('use DDNS to set the SOA SERIAL to ([0-9]+)')
 def set_serial_to(step, new_serial):
     """