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

3
test/test_tls.py
View File

@@ -1,5 +1,4 @@
import io import io
import re
import ssl import ssl
import subprocess import subprocess
import time import time
@@ -620,10 +619,8 @@ basicConstraints = critical,CA:TRUE"""
skip_alert(r'process .* %s.* exited on signal 9' % app_id) skip_alert(r'process .* %s.* exited on signal 9' % app_id)
self.wait_for_record( self.wait_for_record(
re.compile(
r' (?!' + app_id + r'#)(\d+)#\d+ "mirror" application started' r' (?!' + app_id + r'#)(\d+)#\d+ "mirror" application started'
) )
)
resp = self.post_ssl( resp = self.post_ssl(
headers={ headers={

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'): def date_to_sec_epoch(self, date, template='%a, %d %b %Y %X %Z'):
return time.mktime(time.strptime(date, template)) 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: 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: 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: with Log.open(name) as f:
for i in range(wait): for i in range(wait):
found = re.search(pattern, f.read()) found = re.search(pattern, f.read(), flags)
if found is not None: if found is not None:
break break

4
test/unit/http.py
View File

@@ -209,9 +209,7 @@ class TestHTTP:
return {} return {}
headers_text, body = m.group(1), m.group(2) headers_text, body = m.group(1), m.group(2)
headers_lines = re.findall('(.*?)\x0d\x0a?', headers_text, re.M | re.S)
p = re.compile('(.*?)\x0d\x0a?', re.M | re.S)
headers_lines = p.findall(headers_text)
status = re.search( status = re.search(
r'^HTTP\/\d\.\d\s(\d+)|$', headers_lines.pop(0) r'^HTTP\/\d\.\d\s(\d+)|$', headers_lines.pop(0)