summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorAndrey Zelenkov <zelenkov@nginx.com>2019-03-01 18:58:16 +0300
committerAndrey Zelenkov <zelenkov@nginx.com>2019-03-01 18:58:16 +0300
commitae36276cfc9ce2ecfb09be4d4c16e0b1b81901ee (patch)
treeb01baed75edea6ab09e1711c55d3f41c71c4dd59
parent557a792b33f0cc2fd0bc36c164b6d46a564712ea (diff)
downloadunit-ae36276cfc9ce2ecfb09be4d4c16e0b1b81901ee.tar.gz
unit-ae36276cfc9ce2ecfb09be4d4c16e0b1b81901ee.tar.bz2
Tests: made tests compatible with PHP 5.3.
-rw-r--r--test/php/404/index.php8
-rw-r--r--test/php/ini_precision/ini/php.ini (renamed from test/php/ini_precision/php.ini)0
-rw-r--r--test/test_php_application.py6
3 files changed, 10 insertions, 4 deletions
diff --git a/test/php/404/index.php b/test/php/404/index.php
index 92afdf19..561dbec2 100644
--- a/test/php/404/index.php
+++ b/test/php/404/index.php
@@ -1,4 +1,10 @@
<?php
-http_response_code(404);
+if (!function_exists('http_response_code')) {
+ header('Temporary-Header: True', true, 404);
+ header_remove('Temporary-Header');
+} else {
+ http_response_code(404);
+}
+
include('404.html');
?>
diff --git a/test/php/ini_precision/php.ini b/test/php/ini_precision/ini/php.ini
index 51dbdede..51dbdede 100644
--- a/test/php/ini_precision/php.ini
+++ b/test/php/ini_precision/ini/php.ini
diff --git a/test/test_php_application.py b/test/test_php_application.py
index ac74359d..ddc3cad5 100644
--- a/test/test_php_application.py
+++ b/test/test_php_application.py
@@ -160,10 +160,10 @@ class TestUnitPHPApplication(unit.TestUnitApplicationPHP):
self.assertNotEqual(self.get()['headers']['X-Precision'], '4',
'ini value default')
- self.conf({"file": "php.ini"}, 'applications/ini_precision/options')
+ self.conf({"file": "ini/php.ini"}, 'applications/ini_precision/options')
self.assertEqual(self.get()['headers']['X-File'],
- self.current_dir + '/php/ini_precision/php.ini', 'ini file')
+ self.current_dir + '/php/ini_precision/ini/php.ini', 'ini file')
self.assertEqual(self.get()['headers']['X-Precision'], '4', 'ini value')
@unittest.expectedFailure
@@ -200,7 +200,7 @@ class TestUnitPHPApplication(unit.TestUnitApplicationPHP):
def test_php_application_ini_user_2(self):
self.load('ini_precision')
- self.conf({"file": "php.ini"}, 'applications/ini_precision/options')
+ self.conf({"file": "ini/php.ini"}, 'applications/ini_precision/options')
self.assertEqual(self.get()['headers']['X-Precision'], '4',
'ini user file')