summaryrefslogtreecommitdiffhomepage
path: root/test/unit/applications/proto.py
diff options
context:
space:
mode:
authorAndrei Zeliankou <zelenkov@nginx.com>2020-09-16 21:31:15 +0100
committerAndrei Zeliankou <zelenkov@nginx.com>2020-09-16 21:31:15 +0100
commitd5e915934066c77a59d211efafca10c117b73d05 (patch)
treef894a3c09bd8aa43e87276eed377eb09f97e46fe /test/unit/applications/proto.py
parent77ecb6ab49257dd662aa9c461fed3dc1d74e5092 (diff)
downloadunit-d5e915934066c77a59d211efafca10c117b73d05.tar.gz
unit-d5e915934066c77a59d211efafca10c117b73d05.tar.bz2
Tests: migrated to the pytest.
Diffstat (limited to 'test/unit/applications/proto.py')
-rw-r--r--test/unit/applications/proto.py18
1 files changed, 14 insertions, 4 deletions
diff --git a/test/unit/applications/proto.py b/test/unit/applications/proto.py
index 244cb5be..7bf7e244 100644
--- a/test/unit/applications/proto.py
+++ b/test/unit/applications/proto.py
@@ -1,7 +1,9 @@
+import os
import re
import time
from unit.control import TestControl
+from conftest import option
class TestApplicationProto(TestControl):
@@ -12,7 +14,7 @@ class TestApplicationProto(TestControl):
return time.mktime(time.strptime(date, template))
def search_in_log(self, pattern, name='unit.log'):
- with open(self.testdir + '/' + name, 'r', errors='ignore') as f:
+ with open(self.temp_dir + '/' + name, 'r', errors='ignore') as f:
return re.search(pattern, f.read())
def wait_for_record(self, pattern, name='unit.log'):
@@ -26,6 +28,16 @@ class TestApplicationProto(TestControl):
return found
+ def get_appication_type(self):
+ current_test = (
+ os.environ.get('PYTEST_CURRENT_TEST').split(':')[-1].split(' ')[0]
+ )
+
+ if current_test in option.generated_tests:
+ return option.generated_tests[current_test]
+
+ return None
+
def _load_conf(self, conf, **kwargs):
if 'applications' in conf:
for app in conf['applications'].keys():
@@ -39,6 +51,4 @@ class TestApplicationProto(TestControl):
if 'isolation' in kwargs:
app_conf['isolation'] = kwargs['isolation']
- self.assertIn(
- 'success', self.conf(conf), 'load application configuration'
- )
+ assert 'success' in self.conf(conf), 'load application configuration'