From 3e4fa1e2022970dee003bea0932ea0c10f8744ba Mon Sep 17 00:00:00 2001 From: Andrei Zeliankou Date: Thu, 25 May 2023 14:26:12 +0100 Subject: Tests: removed unused variables. --- test/unit/applications/proto.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'test/unit/applications/proto.py') diff --git a/test/unit/applications/proto.py b/test/unit/applications/proto.py index f04ee408..f4d4afe4 100644 --- a/test/unit/applications/proto.py +++ b/test/unit/applications/proto.py @@ -26,7 +26,7 @@ class TestApplicationProto(TestControl): 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): + for _ in range(wait): found = re.search(pattern, f.read(), flags) if found is not None: -- cgit From f55818059c01ff9e61bee8107ed1389fe272a787 Mon Sep 17 00:00:00 2001 From: Andrei Zeliankou Date: Mon, 29 May 2023 14:23:52 +0100 Subject: Tests: Log reworked. All log-related code moved to the log.py. --- test/unit/applications/proto.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'test/unit/applications/proto.py') diff --git a/test/unit/applications/proto.py b/test/unit/applications/proto.py index f4d4afe4..3f4c13d3 100644 --- a/test/unit/applications/proto.py +++ b/test/unit/applications/proto.py @@ -17,12 +17,10 @@ class TestApplicationProto(TestControl): return time.mktime(time.strptime(date, template)) def findall(self, pattern, name='unit.log', flags=re.M): - with Log.open(name) as f: - return re.findall(pattern, f.read(), flags) + return re.findall(pattern, Log.read(name), flags) def search_in_log(self, pattern, name='unit.log', flags=re.M): - with Log.open(name) as f: - return re.search(pattern, f.read(), flags) + return re.search(pattern, Log.read(name), flags) def wait_for_record(self, pattern, name='unit.log', wait=150, flags=re.M): with Log.open(name) as f: -- cgit From 31ff94add9c4043a753683d9e8b68733c69aa1ac Mon Sep 17 00:00:00 2001 From: Andrei Zeliankou Date: Mon, 29 May 2023 16:45:49 +0100 Subject: Tests: more fixtures. Common methods from applications/proto.py converted to the fixtures. sysctl check moved to the specific file where it is using. Some options moved to the constructor to have early access. --- test/unit/applications/proto.py | 24 ------------------------ 1 file changed, 24 deletions(-) (limited to 'test/unit/applications/proto.py') diff --git a/test/unit/applications/proto.py b/test/unit/applications/proto.py index 3f4c13d3..00ea44b2 100644 --- a/test/unit/applications/proto.py +++ b/test/unit/applications/proto.py @@ -10,30 +10,6 @@ from unit.option import option class TestApplicationProto(TestControl): application_type = None - def sec_epoch(self): - return time.mktime(time.gmtime()) - - 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', flags=re.M): - return re.findall(pattern, Log.read(name), flags) - - def search_in_log(self, pattern, name='unit.log', flags=re.M): - return re.search(pattern, Log.read(name), flags) - - def wait_for_record(self, pattern, name='unit.log', wait=150, flags=re.M): - with Log.open(name) as f: - for _ in range(wait): - found = re.search(pattern, f.read(), flags) - - if found is not None: - break - - time.sleep(0.1) - - return found - def get_application_type(self): current_test = ( os.environ.get('PYTEST_CURRENT_TEST').split(':')[-1].split(' ')[0] -- cgit From ce2405ec3dd97e8bdf8f63312e3c6ce59ef562d4 Mon Sep 17 00:00:00 2001 From: Andrei Zeliankou Date: Mon, 12 Jun 2023 14:16:59 +0100 Subject: Tests: prerequisites checking reworked. Prerequisites check moved to the module level to simplify class structure. Discovery and prerequisites checks functions moved to the separate files. Introduced "require" fixture to provide per-test requirements check. --- test/unit/applications/proto.py | 3 --- 1 file changed, 3 deletions(-) (limited to 'test/unit/applications/proto.py') diff --git a/test/unit/applications/proto.py b/test/unit/applications/proto.py index 00ea44b2..354c31af 100644 --- a/test/unit/applications/proto.py +++ b/test/unit/applications/proto.py @@ -1,9 +1,6 @@ import os -import re -import time from unit.control import TestControl -from unit.log import Log from unit.option import option -- cgit From c183bd8749a19477390f8cb77efe5f6d223f0905 Mon Sep 17 00:00:00 2001 From: Andrei Zeliankou Date: Wed, 14 Jun 2023 18:20:09 +0100 Subject: Tests: get rid of classes in test files. Class usage came from the unittest framework and it was always redundant after migration to the pytest. This commit removes classes from files containing tests to make them more readable and understandable. --- test/unit/applications/proto.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'test/unit/applications/proto.py') diff --git a/test/unit/applications/proto.py b/test/unit/applications/proto.py index 354c31af..7a1636c6 100644 --- a/test/unit/applications/proto.py +++ b/test/unit/applications/proto.py @@ -1,10 +1,10 @@ import os -from unit.control import TestControl +from unit.control import Control from unit.option import option -class TestApplicationProto(TestControl): +class ApplicationProto(Control): application_type = None def get_application_type(self): -- cgit