Tests: minor improvements.

Added "go" availability check before trying to build an application.

update_action() method used were possible and fixed bug with
the relative path determination in test_static_chroot.py.

Templates optimization and style fixes.

5 files changed, 39 insertions, 98 deletions

diff --git a/test/test_static_chroot.py b/test/test_static_chroot.py
index b896a9b9..e33a181c 100644
--- a/test/test_static_chroot.py
+++ b/test/test_static_chroot.py
@@ -14,8 +14,7 @@ class TestStaticChroot(TestApplicationProto):
         Path(temp_dir + '/assets/index.html').write_text('0123456789')
         Path(temp_dir + '/assets/dir/file').write_text('blah')
 
-        test = Path(__file__)
-        self.test_path = '/' + test.parent.name + '/' + test.name
+        self.test_path = '/' + os.path.relpath(Path(__file__))
 
         self._load_conf(
             {
@@ -39,26 +38,18 @@ class TestStaticChroot(TestApplicationProto):
         assert self.get(url='/dir/file')['status'] == 200, 'default chroot'
         assert self.get(url='/index.html')['status'] == 200, 'default chroot 2'
 
-        assert 'success' in self.conf(
-            {
-                "share": temp_dir + "/assets$uri",
-                "chroot": temp_dir + "/assets/dir",
-            },
-            'routes/0/action',
-        ), 'configure chroot'
+        assert 'success' in self.update_action(
+            temp_dir + "/assets$uri", temp_dir + "/assets/dir"
+        )
 
         assert self.get(url='/dir/file')['status'] == 200, 'chroot'
         assert self.get(url='/index.html')['status'] == 403, 'chroot 403 2'
         assert self.get(url='/file')['status'] == 403, 'chroot 403'
 
     def test_share_chroot_array(self, temp_dir):
-        assert 'success' in self.conf(
-            {
-                "share": ["/blah", temp_dir + "/assets$uri"],
-                "chroot": temp_dir + "/assets/dir",
-            },
-            'routes/0/action',
-        ), 'configure share array'
+        assert 'success' in self.update_action(
+            ["/blah", temp_dir + "/assets$uri"], temp_dir + "/assets/dir"
+        )
         assert self.get(url='/dir/file')['status'] == 200, 'share array'
 
         assert 'success' in self.update_action(
@@ -66,13 +57,9 @@ class TestStaticChroot(TestApplicationProto):
         )
         assert self.get_custom('/dir/file', 'dir') == 200, 'array variable'
 
-        assert 'success' in self.conf(
-            {
-                "share": ["/blah", "/blah2"],
-                "chroot": temp_dir + "/assets/dir",
-            },
-            'routes/0/action',
-        ), 'configure share array bad'
+        assert 'success' in self.update_action(
+            ["/blah", "/blah2"], temp_dir + "/assets/dir"
+        )
         assert self.get()['status'] != 200, 'share array bad'
 
     def test_static_chroot_permission(self, is_su, temp_dir):
@@ -81,58 +68,30 @@ class TestStaticChroot(TestApplicationProto):
 
         os.chmod(temp_dir + '/assets/dir', 0o100)
 
-        assert 'success' in self.conf(
-            {
-                "share": temp_dir + "/assets$uri",
-                "chroot": temp_dir + "/assets/dir",
-            },
-            'routes/0/action',
+        assert 'success' in self.update_action(
+            temp_dir + "/assets$uri", temp_dir + "/assets/dir"
         ), 'configure chroot'
 
         assert self.get(url='/dir/file')['status'] == 200, 'chroot'
 
     def test_static_chroot_empty(self, temp_dir):
-        assert 'success' in self.conf(
-            {"share": temp_dir + "/assets$uri", "chroot": ""},
-            'routes/0/action',
-        ), 'configure chroot empty absolute'
-
-        assert (
-            self.get(url='/dir/file')['status'] == 200
-        ), 'chroot empty absolute'
-
-        assert 'success' in self.conf(
-            {"share": ".$uri", "chroot": ""},
-            'routes/0/action',
-        ), 'configure chroot empty relative'
+        assert 'success' in self.update_action(temp_dir + "/assets$uri", "")
+        assert self.get(url='/dir/file')['status'] == 200, 'empty absolute'
 
-        assert (
-            self.get(url=self.test_path)['status'] == 200
-        ), 'chroot empty relative'
+        assert 'success' in self.update_action(".$uri", "")
+        assert self.get(url=self.test_path)['status'] == 200, 'empty relative'
 
     def test_static_chroot_relative(self, is_su, temp_dir):
         if is_su:
             pytest.skip('does\'t work under root')
 
-        assert 'success' in self.conf(
-            {"share": temp_dir + "/assets$uri", "chroot": "."},
-            'routes/0/action',
-        ), 'configure relative chroot'
-
+        assert 'success' in self.update_action(temp_dir + "/assets$uri", ".")
         assert self.get(url='/dir/file')['status'] == 403, 'relative chroot'
 
-        assert 'success' in self.conf(
-            {"share": ".$uri"},
-            'routes/0/action',
-        ), 'configure relative share'
-
+        assert 'success' in self.conf({"share": ".$uri"}, 'routes/0/action')
         assert self.get(url=self.test_path)['status'] == 200, 'relative share'
 
-        assert 'success' in self.conf(
-            {"share": ".$uri", "chroot": "."},
-            'routes/0/action',
-        ), 'configure relative'
-
+        assert 'success' in self.update_action(".$uri", ".")
         assert self.get(url=self.test_path)['status'] == 200, 'relative'
 
     def test_static_chroot_variables(self, temp_dir):
@@ -150,64 +109,41 @@ class TestStaticChroot(TestApplicationProto):
         assert 'success' in self.update_action(
             temp_dir + '/assets/dir/$host', '$uri/assets/dir'
         )
-
         assert self.get_custom(temp_dir, 'file') == 200
 
     def test_static_chroot_variables_buildin_mid(self, temp_dir):
         assert 'success' in self.update_action(
             temp_dir + '/assets$uri', temp_dir + '/$host/dir'
         )
-
         assert self.get_custom('/dir/file', 'assets') == 200
 
     def test_static_chroot_variables_buildin_end(self, temp_dir):
         assert 'success' in self.update_action(
             temp_dir + '/assets$uri', temp_dir + '/assets/$host'
         )
-
         assert self.get_custom('/dir/file', 'dir') == 200
 
     def test_static_chroot_slash(self, temp_dir):
-        assert 'success' in self.conf(
-            {
-                "share": temp_dir + "/assets$uri",
-                "chroot": temp_dir + "/assets/dir/",
-            },
-            'routes/0/action',
-        ), 'configure chroot slash end'
-
+        assert 'success' in self.update_action(
+            temp_dir + "/assets$uri", temp_dir + "/assets/dir/"
+        )
         assert self.get(url='/dir/file')['status'] == 200, 'slash end'
         assert self.get(url='/dirxfile')['status'] == 403, 'slash end bad'
 
-        assert 'success' in self.conf(
-            {
-                "share": temp_dir + "/assets$uri",
-                "chroot": temp_dir + "/assets/dir",
-            },
-            'routes/0/action',
-        ), 'configure chroot no slash end'
-
+        assert 'success' in self.update_action(
+            temp_dir + "/assets$uri", temp_dir + "/assets/dir"
+        )
         assert self.get(url='/dir/file')['status'] == 200, 'no slash end'
 
-        assert 'success' in self.conf(
-            {
-                "share": temp_dir + "/assets$uri",
-                "chroot": temp_dir + "/assets/dir/",
-            },
-            'routes/0/action',
-        ), 'configure chroot slash end 2'
-
+        assert 'success' in self.update_action(
+            temp_dir + "/assets$uri", temp_dir + "/assets/dir/"
+        )
         assert self.get(url='/dir/file')['status'] == 200, 'slash end 2'
         assert self.get(url='/dirxfile')['status'] == 403, 'slash end 2 bad'
 
-        assert 'success' in self.conf(
-            {
-                "share": temp_dir + "///assets/////$uri",
-                "chroot": temp_dir + "//assets////dir///",
-            },
-            'routes/0/action',
-        ), 'configure chroot multiple slashes'
-
+        assert 'success' in self.update_action(
+            temp_dir + "///assets/////$uri", temp_dir + "//assets////dir///"
+        )
         assert self.get(url='/dir/file')['status'] == 200, 'multiple slashes'
 
     def test_static_chroot_invalid(self, temp_dir):
diff --git a/test/test_tls.py b/test/test_tls.py
index 56ee8298..85f9d3b1 100644
--- a/test/test_tls.py
+++ b/test/test_tls.py
@@ -13,7 +13,7 @@ class TestTLS(TestApplicationTLS):
     prerequisites = {'modules': {'python': 'any', 'openssl': 'any'}}
 
     def openssl_date_to_sec_epoch(self, date):
-        return self.date_to_sec_epoch(date, '%b %d %H:%M:%S %Y %Z')
+        return self.date_to_sec_epoch(date, '%b %d %X %Y %Z')
 
     def add_tls(self, application='empty', cert='default', port=7080):
         assert 'success' in self.conf(
diff --git a/test/test_tls_sni.py b/test/test_tls_sni.py
index dbd5d900..44cc21e1 100644
--- a/test/test_tls_sni.py
+++ b/test/test_tls_sni.py
@@ -18,7 +18,7 @@ class TestTLSSNI(TestApplicationTLS):
         )
 
     def openssl_date_to_sec_epoch(self, date):
-        return self.date_to_sec_epoch(date, '%b %d %H:%M:%S %Y %Z')
+        return self.date_to_sec_epoch(date, '%b %d %X %Y %Z')
 
     def add_tls(self, cert='default'):
         assert 'success' in self.conf(
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..6ba7b9b8 100644
--- a/test/unit/applications/proto.py
+++ b/test/unit/applications/proto.py
@@ -13,7 +13,7 @@ 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'):