technocloud-public/nginx-unit
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Tests: added flags to search functions in proto.py.

Browse Source 
Also removed unnesessary re.compile() calls.
This commit is contained in:
Andrei Zeliankou
2022-07-28 14:12:19 +01:00
parent 3f8cf62c03
commit 69e690affe
3 changed files with 8 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
test/unit/applications/proto.py
View File

@@ -16,18 +16,18 @@ class TestApplicationProto(TestControl):
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'):
def findall(self, pattern, name='unit.log', flags=re.M):
with Log.open(name) as f:
return re.findall(pattern, f.read())
return re.findall(pattern, f.read(), flags)
def search_in_log(self, pattern, name='unit.log'):
def search_in_log(self, pattern, name='unit.log', flags=re.M):
with Log.open(name) as f:
return re.search(pattern, f.read())
return re.search(pattern, f.read(), flags)
def wait_for_record(self, pattern, name='unit.log', wait=150):
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):
found = re.search(pattern, f.read())
found = re.search(pattern, f.read(), flags)
if found is not None:
break