Merged with the default branch.1.28.0-1

2 files changed, 12 insertions, 7 deletions

diff --git a/test/unit/applications/lang/go.py b/test/unit/applications/lang/go.py
index 04af26e1..3db955f3 100644
--- a/test/unit/applications/lang/go.py
+++ b/test/unit/applications/lang/go.py
@@ -9,6 +9,11 @@ from unit.option import option
 class TestApplicationGo(TestApplicationProto):
     @staticmethod
     def prepare_env(script, name='app', static=False):
+        try:
+            subprocess.check_output(['which', 'go'])
+        except subprocess.CalledProcessError:
+            return None
+
         temp_dir = option.temp_dir + '/go/'
 
         if not os.path.exists(temp_dir):
diff --git a/test/unit/applications/proto.py b/test/unit/applications/proto.py
index cd8672ba..f04ee408 100644
--- a/test/unit/applications/proto.py
+++ b/test/unit/applications/proto.py
@@ -13,21 +13,21 @@ class TestApplicationProto(TestControl):
     def sec_epoch(self):
         return time.mktime(time.gmtime())
 
-    def date_to_sec_epoch(self, date, template='%a, %d %b %Y %H:%M:%S %Z'):
+    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