technocloud-public/nginx-unit
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Tests: fixed loading selected module version.

Browse Source 
Previously, for PHP, Ruby, and Perl the latest version was always loaded
in multi-version tests.
This commit is contained in:
Valentin Bartenev
2020-10-07 22:04:54 +03:00
parent 3f513f434f
commit 645683f432
3 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
test/unit/applications/lang/perl.py
View File

@@ -7,13 +7,17 @@ class TestApplicationPerl(TestApplicationProto):
def load(self, script, name='psgi.pl', **kwargs): def load(self, script, name='psgi.pl', **kwargs):
script_path = option.test_dir + '/perl/' + script script_path = option.test_dir + '/perl/' + script
appication_type = self.get_appication_type()
if appication_type is None:
appication_type = self.application_type
self._load_conf( self._load_conf(
{ {
"listeners": {"*:7080": {"pass": "applications/" + script}}, "listeners": {"*:7080": {"pass": "applications/" + script}},
"applications": { "applications": {
script: { script: {
"type": self.application_type, "type": appication_type,
"processes": {"spare": 0}, "processes": {"spare": 0},
"working_directory": script_path, "working_directory": script_path,
"script": script_path + '/' + name, "script": script_path + '/' + name,

6
test/unit/applications/lang/php.py
View File

@@ -7,13 +7,17 @@ class TestApplicationPHP(TestApplicationProto):
def load(self, script, index='index.php', **kwargs): def load(self, script, index='index.php', **kwargs):
script_path = option.test_dir + '/php/' + script script_path = option.test_dir + '/php/' + script
appication_type = self.get_appication_type()
if appication_type is None:
appication_type = self.application_type
self._load_conf( self._load_conf(
{ {
"listeners": {"*:7080": {"pass": "applications/" + script}}, "listeners": {"*:7080": {"pass": "applications/" + script}},
"applications": { "applications": {
script: { script: {
"type": self.application_type, "type": appication_type,
"processes": {"spare": 0}, "processes": {"spare": 0},
"root": script_path, "root": script_path,
"working_directory": script_path, "working_directory": script_path,

6
test/unit/applications/lang/ruby.py
View File

@@ -7,13 +7,17 @@ class TestApplicationRuby(TestApplicationProto):
def load(self, script, name='config.ru', **kwargs): def load(self, script, name='config.ru', **kwargs):
script_path = option.test_dir + '/ruby/' + script script_path = option.test_dir + '/ruby/' + script
appication_type = self.get_appication_type()
if appication_type is None:
appication_type = self.application_type
self._load_conf( self._load_conf(
{ {
"listeners": {"*:7080": {"pass": "applications/" + script}}, "listeners": {"*:7080": {"pass": "applications/" + script}},
"applications": { "applications": {
script: { script: {
"type": self.application_type, "type": appication_type,
"processes": {"spare": 0}, "processes": {"spare": 0},
"working_directory": script_path, "working_directory": script_path,
"script": script_path + '/' + name, "script": script_path + '/' + name,