From: Jelte Jansen Date: Thu, 24 Jan 2013 11:10:20 +0000 (+0100) Subject: [1897] remove hostname from lettuce http log check X-Git-Tag: bind10-1.0.0-rc-release~76^2~1^2~1 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=779d9312bf84dcf7ce26bd1b1d6276179e026ad2;p=thirdparty%2Fkea.git [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 40be5599a5..50d5efae74 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 8df0bae1b8..f0fad4d5c6 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) -@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