diff options
author | Andrei Zeliankou <zelenkov@nginx.com> | 2022-06-30 14:40:17 +0100 |
---|---|---|
committer | Andrei Zeliankou <zelenkov@nginx.com> | 2022-06-30 14:40:17 +0100 |
commit | a3699557a3e4605788bb02a34de8a7979ec96629 (patch) | |
tree | 19d220ed9b14b4d1afbe83962b2f9a34141ca2bc /test/unit | |
parent | 63667e2f9c571ad4357a30e42b321bec6a97ee89 (diff) | |
download | unit-a3699557a3e4605788bb02a34de8a7979ec96629.tar.gz unit-a3699557a3e4605788bb02a34de8a7979ec96629.tar.bz2 |
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.
Diffstat (limited to 'test/unit')
-rw-r--r-- | test/unit/applications/lang/go.py | 5 | ||||
-rw-r--r-- | test/unit/applications/proto.py | 2 |
2 files changed, 6 insertions, 1 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..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'): |