[1897] remove hostname from lettuce http log check

diff --git a/tests/lettuce/features/stats_httpd.feature b/tests/lettuce/features/stats_httpd.feature
index 40be5599a580b59ab767b94cb23221161761d66c..50d5efae7459254cc42fea8f6b68136a776b0cbb 100644 (file)
--- 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 8df0bae1b8a68e0ba8fbd4364ebabc52d4b837f1..f0fad4d5c6d0d6ac55e01f940dab1d1b477cfbf4 100644 (file)
--- 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)
 
-@step('wait (?:(\d+) times )?for (new )?(\w+) stderr message (\w+)(?: not (\w+))?')
+@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