BIND 10 trac1290, updated. 4cf570ad0a107cbf70a6e96e8db30eb2c8b8a2ff [trac1290] add 'new' options to wait for stdout/stderr message

[BIND 10 source code commits]

The branch, trac1290 has been updated
       via  4cf570ad0a107cbf70a6e96e8db30eb2c8b8a2ff (commit)
      from  aa35477883e1a5b1740092296d463ecfd277dbbb (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 4cf570ad0a107cbf70a6e96e8db30eb2c8b8a2ff
Author: Jelte Jansen <jelte at isc.org>
Date:   Fri Oct 21 13:46:41 2011 +0000

    [trac1290] add 'new' options to wait for stdout/stderr message

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

Summary of changes:
 tests/lettuce/features/server_from_sqlite3.feature |    8 ++++----
 tests/lettuce/features/steps.py                    |   10 +++++-----
 2 files changed, 9 insertions(+), 9 deletions(-)

-----------------------------------------------------------------------
diff --git a/tests/lettuce/features/server_from_sqlite3.feature b/tests/lettuce/features/server_from_sqlite3.feature
index c8f84f4..718fefd 100644
--- a/tests/lettuce/features/server_from_sqlite3.feature
+++ b/tests/lettuce/features/server_from_sqlite3.feature
@@ -65,13 +65,13 @@ Feature: SQLite3 backend
         Then wait for bind10 auth to start
         Wait for bind10 stderr message CMDCTL_STARTED
         A query for www.example.org should have rcode NOERROR
-        Wait for bind10 stderr message AUTH_SEND_NORMAL_RESPONSE
+        Wait for new bind10 stderr message AUTH_SEND_NORMAL_RESPONSE
         Then set bind10 configuration Auth/database_file to data/empty_db.sqlite3
-        And wait for bind10 stderr message DATASRC_SQLITE_OPEN
+        And wait for new bind10 stderr message DATASRC_SQLITE_OPEN
         A query for www.example.org should have rcode REFUSED
-        Wait for bind10 stderr message AUTH_SEND_NORMAL_RESPONSE
+        Wait for new bind10 stderr message AUTH_SEND_NORMAL_RESPONSE
         Then set bind10 configuration Auth/database_file to data/example.org.sqlite3
-        And wait for bind10 stderr message DATASRC_SQLITE_OPEN
+        And wait for new bind10 stderr message DATASRC_SQLITE_OPEN
         A query for www.example.org should have rcode NOERROR
 
     Scenario: two bind10 instances
diff --git a/tests/lettuce/features/steps.py b/tests/lettuce/features/steps.py
index d11a601..bbe2970 100644
--- a/tests/lettuce/features/steps.py
+++ b/tests/lettuce/features/steps.py
@@ -10,13 +10,13 @@ import os
 def stop_a_named_process(step, process_name):
     world.stop_process(process_name)
 
- at step('wait for (\w+) stderr message (\w+)')
-def wait_for_message(step, process_name, message):
-    world.wait_for_output_lines_stderr(process_name, [message], False)
+ at step('wait for (new )?(\w+) stderr message (\w+)')
+def wait_for_message(step, new, process_name, message):
+    world.wait_for_output_lines_stderr(process_name, [message], new is None)
 
- at step('wait for (\w+) stdout message (\w+)')
+ at step('wait for (new )?(\w+) stdout message (\w+)')
 def wait_for_message(step, process_name, message):
-    world.wait_for_output_lines_stdout(process_name, [message], False)
+    world.wait_for_output_lines_stdout(process_name, [message], new is None)
 
 @step('Given I have no database')
 def given_i_have_no_database(step):