[tests] Use re.search for assertOutput(Not)Contains

Standardizes the `assertOutputContains` and `assertOutputNotContains`
methods to use `re.search()`, instead of separate parsing methods.
`search()` replaces `match()` for efficiency purposes against the
collected output.

Related: #2507

Signed-off-by: Jake Hunsaker <jhunsake@redhat.com>

1 files changed, 4 insertions, 2 deletions

diff --git a/tests/sos_tests.py b/tests/sos_tests.py
index d71fa624..590ac7bd 100644
--- a/tests/sos_tests.py
+++ b/tests/sos_tests.py
@@ -400,7 +400,8 @@ class BaseSoSReportTest(BaseSoSTest):
         :param content:  The string that should not be in stdout
         :type content:  ``str``
         """
-        assert content in self.cmd_output.stdout, "Content string '%s' not in output" % content
+        found = re.search(r"(.*)?%s(.*)?" % content, self.cmd_output.stdout)
+        assert found, "Content string '%s' not in output" % content
 
     def assertOutputNotContains(self, content):
         """Ensure that stdout did NOT contain the given content string
@@ -408,7 +409,8 @@ class BaseSoSReportTest(BaseSoSTest):
         :param content:  The string that should not be in stdout
         :type content:  ``str``
         """
-        assert not re.match(".*%s.*" % content, self.cmd_output.stdout), "String '%s' present in stdout" % content
+        found = re.search(r"(.*)?%s(.*)?" % content, self.cmd_output.stdout)
+        assert not found, "String '%s' present in stdout" % content
 
     def assertPluginIncluded(self, plugin):
         """Ensure that the specified plugin did run for the sos execution