From a3699557a3e4605788bb02a34de8a7979ec96629 Mon Sep 17 00:00:00 2001 From: Andrei Zeliankou Date: Thu, 30 Jun 2022 14:40:17 +0100 Subject: 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. --- test/unit/applications/lang/go.py | 5 +++++ test/unit/applications/proto.py | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) (limited to 'test/unit/applications') 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'): -- cgit