summaryrefslogtreecommitdiffhomepage
path: root/test/test_python_application.py
diff options
context:
space:
mode:
authorAndrei Zeliankou <zelenkov@nginx.com>2020-10-19 22:25:29 +0100
committerAndrei Zeliankou <zelenkov@nginx.com>2020-10-19 22:25:29 +0100
commit54837759f36eddb80af22c8d73e103a948221dc7 (patch)
tree420c6ce21ad3868db4037d160406f7754bb392e5 /test/test_python_application.py
parentd8628a43d0705deeb3473faf0252288038defc2b (diff)
downloadunit-54837759f36eddb80af22c8d73e103a948221dc7.tar.gz
unit-54837759f36eddb80af22c8d73e103a948221dc7.tar.bz2
Tests: fixed unit.log print.
Diffstat (limited to '')
-rw-r--r--test/test_python_application.py16
1 files changed, 9 insertions, 7 deletions
diff --git a/test/test_python_application.py b/test/test_python_application.py
index 3e27a24c..6ea9f4ff 100644
--- a/test/test_python_application.py
+++ b/test/test_python_application.py
@@ -5,7 +5,9 @@ import time
import pytest
+from conftest import option
from conftest import skip_alert
+from conftest import unit_stop
from unit.applications.lang.python import TestApplicationPython
@@ -13,7 +15,7 @@ class TestPythonApplication(TestApplicationPython):
prerequisites = {'modules': {'python': 'all'}}
def findall(self, pattern):
- with open(self.temp_dir + '/unit.log', 'r', errors='ignore') as f:
+ with open(option.temp_dir + '/unit.log', 'r', errors='ignore') as f:
return re.findall(pattern, f.read())
def test_python_application_variables(self):
@@ -156,7 +158,7 @@ custom-header: BLAH
self.conf({"listeners": {}, "applications": {}})
- self.stop()
+ unit_stop()
assert (
self.wait_for_record(r'RuntimeError') is not None
@@ -344,7 +346,7 @@ Connection: close
self.conf({"listeners": {}, "applications": {}})
- self.stop()
+ unit_stop()
assert self.wait_for_record(r'At exit called\.') is not None, 'atexit'
@@ -507,7 +509,7 @@ last line: 987654321
self.get()
- self.stop()
+ unit_stop()
assert (
self.wait_for_record(r'\[error\].+Error in application\.')
@@ -550,7 +552,7 @@ last line: 987654321
self.get()
- self.stop()
+ unit_stop()
assert self.wait_for_record(r'Close called\.') is not None, 'close'
@@ -559,7 +561,7 @@ last line: 987654321
self.get()
- self.stop()
+ unit_stop()
assert (
self.wait_for_record(r'Close called\.') is not None
@@ -570,7 +572,7 @@ last line: 987654321
self.get()
- self.stop()
+ unit_stop()
assert (
self.wait_for_record(