summaryrefslogtreecommitdiffhomepage
path: root/test/test_php_application.py
diff options
context:
space:
mode:
Diffstat (limited to 'test/test_php_application.py')
-rw-r--r--test/test_php_application.py63
1 files changed, 34 insertions, 29 deletions
diff --git a/test/test_php_application.py b/test/test_php_application.py
index e73c67ba..66e2ef7d 100644
--- a/test/test_php_application.py
+++ b/test/test_php_application.py
@@ -1,13 +1,15 @@
import os
import re
import shutil
+import signal
import time
-from subprocess import call
import pytest
+
from unit.applications.lang.php import TestApplicationPHP
from unit.option import option
+
class TestPHPApplication(TestApplicationPHP):
prerequisites = {'modules': {'php': 'all'}}
@@ -93,37 +95,39 @@ class TestPHPApplication(TestApplicationPHP):
assert resp['status'] == 200, 'query string empty status'
assert resp['headers']['Query-String'] == '', 'query string empty'
- def test_php_application_fastcgi_finish_request(self, temp_dir):
+ def test_php_application_fastcgi_finish_request(self, unit_pid):
self.load('fastcgi_finish_request')
- assert self.get()['body'] == '0123'
+ assert 'success' in self.conf(
+ {"admin": {"auto_globals_jit": "1"}},
+ 'applications/fastcgi_finish_request/options',
+ )
- with open(temp_dir + '/unit.pid', 'r') as f:
- pid = f.read().rstrip()
+ assert self.get()['body'] == '0123'
- call(['kill', '-s', 'USR1', pid])
+ os.kill(unit_pid, signal.SIGUSR1)
- with open(temp_dir + '/unit.log', 'r', errors='ignore') as f:
- errs = re.findall(r'Error in fastcgi_finish_request', f.read())
+ errs = self.findall(r'Error in fastcgi_finish_request')
- assert len(errs) == 0, 'no error'
+ assert len(errs) == 0, 'no error'
- def test_php_application_fastcgi_finish_request_2(self, temp_dir):
+ def test_php_application_fastcgi_finish_request_2(self, unit_pid):
self.load('fastcgi_finish_request')
+ assert 'success' in self.conf(
+ {"admin": {"auto_globals_jit": "1"}},
+ 'applications/fastcgi_finish_request/options',
+ )
+
resp = self.get(url='/?skip')
assert resp['status'] == 200
assert resp['body'] == ''
- with open(temp_dir + '/unit.pid', 'r') as f:
- pid = f.read().rstrip()
-
- call(['kill', '-s', 'USR1', pid])
+ os.kill(unit_pid, signal.SIGUSR1)
- with open(temp_dir + '/unit.log', 'r', errors='ignore') as f:
- errs = re.findall(r'Error in fastcgi_finish_request', f.read())
+ errs = self.findall(r'Error in fastcgi_finish_request')
- assert len(errs) == 0, 'no error'
+ assert len(errs) == 0, 'no error'
def test_php_application_query_string_absent(self):
self.load('query_string')
@@ -428,11 +432,13 @@ class TestPHPApplication(TestApplicationPHP):
self.load('auth')
def check_auth(auth):
- resp = self.get(headers={
- 'Host': 'localhost',
- 'Authorization': auth,
- 'Connection': 'close',
- })
+ resp = self.get(
+ headers={
+ 'Host': 'localhost',
+ 'Authorization': auth,
+ 'Connection': 'close',
+ }
+ )
assert resp['status'] == 200, 'status'
assert resp['headers']['X-Digest'] == 'not set', 'Digest'
@@ -534,7 +540,7 @@ class TestPHPApplication(TestApplicationPHP):
r'012345', self.get()['body']
), 'disable_classes before'
- def test_php_application_error_log(self, temp_dir):
+ def test_php_application_error_log(self):
self.load('error_log')
assert self.get()['status'] == 200, 'status'
@@ -547,14 +553,13 @@ class TestPHPApplication(TestApplicationPHP):
assert self.wait_for_record(pattern) is not None, 'errors print'
- with open(temp_dir + '/unit.log', 'r', errors='ignore') as f:
- errs = re.findall(pattern, f.read())
+ errs = self.findall(pattern)
- assert len(errs) == 2, 'error_log count'
+ assert len(errs) == 2, 'error_log count'
- date = errs[0].split('[')[0]
- date2 = errs[1].split('[')[0]
- assert date != date2, 'date diff'
+ date = errs[0].split('[')[0]
+ date2 = errs[1].split('[')[0]
+ assert date != date2, 'date diff'
def test_php_application_script(self):
assert 'success' in self.conf(