From 35c6425a44b24768e352e1d5b24eb70a9647936e Mon Sep 17 00:00:00 2001 From: Johan Holmberg Date: Mon, 15 Jun 2015 21:52:32 +0200 Subject: [PATCH] implement 'stderr_match' like 'stdout_match' --- python/cmdtest.py | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/python/cmdtest.py b/python/cmdtest.py index d483659..05ccd1e 100755 --- a/python/cmdtest.py +++ b/python/cmdtest.py @@ -216,13 +216,10 @@ class Result: expect = ExpectPattern(self, pattern, encoding) expect.check("stdout_match", self._stdout) - def stderr_match(self, pattern): + def stderr_match(self, pattern, encoding='utf-8'): self._checked_stderr = True - lines = self._stderr.lines() - for line in lines: - if re.search(pattern, line): - return - self._error("stderr_match", actual=Lines(lines), expect=Regexp(pattern)) + expect = ExpectPattern(self, pattern, encoding) + expect.check("stderr_match", self._stderr) def stdout_equal(self, content, encoding='utf-8'): self._checked_stdout = True