BIND 10 trac1314, updated. 7515af0e50af796b0b936e9a966eea5bff82dfe9 [1314] address review comments

[BIND 10 source code commits]

The branch, trac1314 has been updated
       via  7515af0e50af796b0b936e9a966eea5bff82dfe9 (commit)
      from  292db243f0d4e4036b265da8b9e5c01db2929f58 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 7515af0e50af796b0b936e9a966eea5bff82dfe9
Author: Jelte Jansen <jelte at isc.org>
Date:   Wed Dec 7 11:48:17 2011 +0100

    [1314] address review comments

-----------------------------------------------------------------------

Summary of changes:
 tests/lettuce/README.tutorial                    |    4 ++--
 tests/lettuce/features/ixfr_out_bind10.feature   |    2 ++
 tests/lettuce/features/terrain/bind10_control.py |   14 ++++++++++++++
 3 files changed, 18 insertions(+), 2 deletions(-)

-----------------------------------------------------------------------
diff --git a/tests/lettuce/README.tutorial b/tests/lettuce/README.tutorial
index 4764788..c7d3cd7 100644
--- a/tests/lettuce/README.tutorial
+++ b/tests/lettuce/README.tutorial
@@ -50,7 +50,7 @@ will need to expand these, but we will look at them shortly.
 This file defines a feature, just under the feature name we can
 provide a description of the feature.
 
-The one scenario we have no has no steps, so if we run it we should
+The one scenario we have has no steps, so if we run it we should
 see something like:
 
 -- output
@@ -84,7 +84,7 @@ So let's add a step that starts bind10.
         When I start bind10 with configuration example.org.config
 --
 
-This is not good enough; it will fire of the process, but setting up
+This is not good enough; it will start the process, but setting up
 b10-auth may take a few moments, so we need to add a step to wait for
 it to be started before we continue.
 
diff --git a/tests/lettuce/features/ixfr_out_bind10.feature b/tests/lettuce/features/ixfr_out_bind10.feature
index adb82fc..07e0d1a 100644
--- a/tests/lettuce/features/ixfr_out_bind10.feature
+++ b/tests/lettuce/features/ixfr_out_bind10.feature
@@ -27,6 +27,7 @@ Feature: IXFR out
 
     Scenario: Test Set 1
         Given I have bind10 running with configuration ixfr-out/testset1-config.db
+        Then wait for bind10 xfrout to start
         The SOA serial for example.com should be 22
 
         #
@@ -125,6 +126,7 @@ Feature: IXFR out
 
     Scenario: Test Set 2
         Given I have bind10 running with configuration ixfr-out/testset1-config.db
+        Then wait for bind10 xfrout to start
         The SOA serial for example.com should be 22
 
         #
diff --git a/tests/lettuce/features/terrain/bind10_control.py b/tests/lettuce/features/terrain/bind10_control.py
index fbbb3a2..32b0c25 100644
--- a/tests/lettuce/features/terrain/bind10_control.py
+++ b/tests/lettuce/features/terrain/bind10_control.py
@@ -79,6 +79,20 @@ def wait_for_auth(step, process_name):
     world.processes.wait_for_stderr_str(process_name, ['AUTH_SERVER_STARTED'],
                                         False)
 
+ at step('wait for bind10 xfrout (?:of (\w+) )?to start')
+def wait_for_xfrout(step, process_name):
+    """Wait for b10-xfrout to run. This is done by blocking until the message
+       XFROUT_NEW_CONFIG_DONE is logged.
+       Parameters:
+       process_name ('of <name', optional): The name of the BIND 10 instance
+                    to wait for. Defaults to 'bind10'.
+    """
+    if process_name is None:
+        process_name = "bind10"
+    world.processes.wait_for_stderr_str(process_name,
+                                        ['XFROUT_NEW_CONFIG_DONE'],
+                                        False)
+
 @step('have bind10 running(?: with configuration ([\S]+))?' +\
       '(?: with cmdctl port (\d+))?' +\
       '(?: as ([\S]+))?')