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