Tests: added flags to search functions in proto.py.

Also removed unnesessary re.compile() calls.

3 files changed, 8 insertions, 13 deletions

diff --git a/test/test_tls.py b/test/test_tls.py
index 85f9d3b1..5d4cead3 100644
--- a/test/test_tls.py
+++ b/test/test_tls.py
@@ -1,5 +1,4 @@
 import io
-import re
 import ssl
 import subprocess
 import time
@@ -620,9 +619,7 @@ basicConstraints = critical,CA:TRUE"""
         skip_alert(r'process .* %s.* exited on signal 9' % app_id)
 
         self.wait_for_record(
-            re.compile(
-                r' (?!' + app_id + r'#)(\d+)#\d+ "mirror" application started'
-            )
+            r' (?!' + app_id + r'#)(\d+)#\d+ "mirror" application started'
         )
 
         resp = self.post_ssl(
diff --git a/test/unit/applications/proto.py b/test/unit/applications/proto.py
index 6ba7b9b8..f04ee408 100644
--- a/test/unit/applications/proto.py
+++ b/test/unit/applications/proto.py
@@ -16,18 +16,18 @@ class TestApplicationProto(TestControl):
     def date_to_sec_epoch(self, date, template='%a, %d %b %Y %X %Z'):
         return time.mktime(time.strptime(date, template))
 
-    def findall(self, pattern, name='unit.log'):
+    def findall(self, pattern, name='unit.log', flags=re.M):
         with Log.open(name) as f:
-            return re.findall(pattern, f.read())
+            return re.findall(pattern, f.read(), flags)
 
-    def search_in_log(self, pattern, name='unit.log'):
+    def search_in_log(self, pattern, name='unit.log', flags=re.M):
         with Log.open(name) as f:
-            return re.search(pattern, f.read())
+            return re.search(pattern, f.read(), flags)
 
-    def wait_for_record(self, pattern, name='unit.log', wait=150):
+    def wait_for_record(self, pattern, name='unit.log', wait=150, flags=re.M):
         with Log.open(name) as f:
             for i in range(wait):
-                found = re.search(pattern, f.read())
+                found = re.search(pattern, f.read(), flags)
 
                 if found is not None:
                     break
diff --git a/test/unit/http.py b/test/unit/http.py
index b4a1a17b..522d2ea6 100644
--- a/test/unit/http.py
+++ b/test/unit/http.py
@@ -209,9 +209,7 @@ class TestHTTP:
             return {}
 
         headers_text, body = m.group(1), m.group(2)
-
-        p = re.compile('(.*?)\x0d\x0a?', re.M | re.S)
-        headers_lines = p.findall(headers_text)
+        headers_lines = re.findall('(.*?)\x0d\x0a?', headers_text, re.M | re.S)
 
         status = re.search(
             r'^HTTP\/\d\.\d\s(\d+)|$', headers_lines.pop(0)