BIND 10 trac1897, updated. cd2c2c8ec6cf8a335897176339c8150228be4a36 [1897] Update lettuce test to new log ID

[BIND 10 source code commits]

The branch, trac1897 has been updated
       via  cd2c2c8ec6cf8a335897176339c8150228be4a36 (commit)
       via  779d9312bf84dcf7ce26bd1b1d6276179e026ad2 (commit)
      from  09c24690d48f8b8b7239668216b8fed9bac179e0 (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 cd2c2c8ec6cf8a335897176339c8150228be4a36
Author: Jelte Jansen <jelte at isc.org>
Date:   Thu Jan 24 13:15:19 2013 +0100

    [1897] Update lettuce test to new log ID

commit 779d9312bf84dcf7ce26bd1b1d6276179e026ad2
Author: Jelte Jansen <jelte at isc.org>
Date:   Thu Jan 24 12:10:20 2013 +0100

    [1897] remove hostname from lettuce http log check

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

Summary of changes:
 tests/lettuce/features/bindctl_commands.feature |    2 +-
 tests/lettuce/features/stats_httpd.feature      |    6 +++---
 tests/lettuce/features/terrain/steps.py         |    2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

-----------------------------------------------------------------------
diff --git a/tests/lettuce/features/bindctl_commands.feature b/tests/lettuce/features/bindctl_commands.feature
index 20a28fc..57406c3 100644
--- a/tests/lettuce/features/bindctl_commands.feature
+++ b/tests/lettuce/features/bindctl_commands.feature
@@ -17,7 +17,7 @@ Feature: control with bindctl
         And wait for bind10 stderr message XFRIN_STARTED
         And wait for bind10 stderr message XFROUT_STARTED
         And wait for bind10 stderr message STATS_STARTING
-        And wait for bind10 stderr message STATHTTPD_STARTED
+        And wait for bind10 stderr message STATSHTTPD_STARTED
 
         Then remove bind10 configuration Boss/components/NOSUCHMODULE
         last bindctl output should contain Error
diff --git a/tests/lettuce/features/stats_httpd.feature b/tests/lettuce/features/stats_httpd.feature
index 40be559..50d5efa 100644
--- a/tests/lettuce/features/stats_httpd.feature
+++ b/tests/lettuce/features/stats_httpd.feature
@@ -7,10 +7,10 @@ Feature: b10-stats-httpd module
 
     When I request the URL http://127.0.0.1:47811/
     # Should result in redirect, so two query logs
-    And wait for new bind10 stderr message localhost "GET / HTTP/1.0" 302 -
-    And wait for new bind10 stderr message localhost "GET /bind10/statistics/xml/ HTTP/1.0" 200 -
+    And wait for new bind10 stderr message "GET / HTTP/1.0" 302 -
+    And wait for new bind10 stderr message "GET /bind10/statistics/xml/ HTTP/1.0" 200 -
     The last http response status code should be 200
 
     When I request the URL http://127.0.0.1:47811/no_such_url
-    And wait for new bind10 stderr message localhost "GET /no_such_url HTTP/1.0" 404 -
+    And wait for new bind10 stderr message "GET /no_such_url HTTP/1.0" 404 -
     The last http response status code should be 404
diff --git a/tests/lettuce/features/terrain/steps.py b/tests/lettuce/features/terrain/steps.py
index 8df0bae..f0fad4d 100644
--- a/tests/lettuce/features/terrain/steps.py
+++ b/tests/lettuce/features/terrain/steps.py
@@ -30,7 +30,7 @@ def stop_a_named_process(step, process_name):
     """
     world.processes.stop_process(process_name)
 
- at step('wait (?:(\d+) times )?for (new )?(\w+) stderr message (\w+)(?: not (\w+))?')
+ at step('wait (?:(\d+) times )?for (new )?(\w+) stderr message (.+)(?: not (.+))?')
 def wait_for_stderr_message(step, times, new, process_name, message, not_message):
     """
     Block until the given message is printed to the given process's stderr