diff options
| author | Valentin Bartenev <vbart@nginx.com> | 2020-10-07 22:04:54 +0300 |
|---|---|---|
| committer | Valentin Bartenev <vbart@nginx.com> | 2020-10-07 22:04:54 +0300 |
| commit | 645683f432d742f42f2769f589fe769585fb7aa0 (patch) | |
| tree | 6984ee9e18e6d011d5e9a5af0a0e5afb3dcb2411 | |
| parent | 3f513f434fbe44810ea2352d4ffc7d4d702b3e12 (diff) | |
| download | unit-645683f432d742f42f2769f589fe769585fb7aa0.tar.gz unit-645683f432d742f42f2769f589fe769585fb7aa0.tar.bz2 | |
Tests: fixed loading selected module version.
Previously, for PHP, Ruby, and Perl the latest version was always loaded
in multi-version tests.
| -rw-r--r-- | test/unit/applications/lang/perl.py | 6 | ||||
| -rw-r--r-- | test/unit/applications/lang/php.py | 6 | ||||
| -rw-r--r-- | test/unit/applications/lang/ruby.py | 6 |
3 files changed, 15 insertions, 3 deletions
diff --git a/test/unit/applications/lang/perl.py b/test/unit/applications/lang/perl.py index 92939d88..d686cc8a 100644 --- a/test/unit/applications/lang/perl.py +++ b/test/unit/applications/lang/perl.py @@ -7,13 +7,17 @@ class TestApplicationPerl(TestApplicationProto): def load(self, script, name='psgi.pl', **kwargs): 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( { "listeners": {"*:7080": {"pass": "applications/" + script}}, "applications": { script: { - "type": self.application_type, + "type": appication_type, "processes": {"spare": 0}, "working_directory": script_path, "script": script_path + '/' + name, diff --git a/test/unit/applications/lang/php.py b/test/unit/applications/lang/php.py index 350eb29b..6ac3d710 100644 --- a/test/unit/applications/lang/php.py +++ b/test/unit/applications/lang/php.py @@ -7,13 +7,17 @@ class TestApplicationPHP(TestApplicationProto): def load(self, script, index='index.php', **kwargs): 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( { "listeners": {"*:7080": {"pass": "applications/" + script}}, "applications": { script: { - "type": self.application_type, + "type": appication_type, "processes": {"spare": 0}, "root": script_path, "working_directory": script_path, diff --git a/test/unit/applications/lang/ruby.py b/test/unit/applications/lang/ruby.py index 534227bd..a6c39b2a 100644 --- a/test/unit/applications/lang/ruby.py +++ b/test/unit/applications/lang/ruby.py @@ -7,13 +7,17 @@ class TestApplicationRuby(TestApplicationProto): def load(self, script, name='config.ru', **kwargs): 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( { "listeners": {"*:7080": {"pass": "applications/" + script}}, "applications": { script: { - "type": self.application_type, + "type": appication_type, "processes": {"spare": 0}, "working_directory": script_path, "script": script_path + '/' + name, |