From: Michal 'vorner' Vaner <michal.vaner@nic.cz>
Date: Tue, 29 Jan 2013 12:36:34 +0000 (+0100)
Subject: Fix regex in lettuce tests
X-Git-Tag: bind10-1.0.0-rc-release~25^2~12
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=76f20bfafceeca8bceefda457fe64904d4d21c59;p=thirdparty%2Fkea.git

Fix regex in lettuce tests

The old version with . didn't work well with the form
  wait … for MESSAGE not OTHER_MESSAGE
Since the whole "MESSAGE not OTHER_MESSAGE" was captured into the first
(.+). This broke several tests in around xfrin and possibly others.

Now the tests pass and reviewed on jabber.
---

diff --git a/tests/lettuce/features/terrain/steps.py b/tests/lettuce/features/terrain/steps.py
index f0fad4d5c6..e470acff0b 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 (.+)(?: not (.+))?')
+@step('wait (?:(\d+) times )?for (new )?(\w+) stderr message (\S+)(?: not (\S+))?')
 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