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

Tests: improving get_application_type() and fixing its name.

Browse Source 
This patch also enables multiversion tests running for Java.
This commit is contained in:
Max Romanov
2020-10-28 00:01:46 +03:00
parent f007ad4dcf
commit 6a00bab41e
7 changed files with 14 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
test/unit/applications/lang/java.py
View File

@@ -9,6 +9,8 @@ from unit.applications.proto import TestApplicationProto
class TestApplicationJava(TestApplicationProto):
application_type = "java"
def prepare_env(self, script):
app_path = option.temp_dir + '/java'
web_inf_path = app_path + '/WEB-INF/'
@@ -84,7 +86,7 @@ class TestApplicationJava(TestApplicationProto):
"applications": {
script: {
"unit_jars": option.current_dir + '/build',
"type": 'java',
"type": self.get_application_type(),
"processes": {"spare": 0},
"working_directory": option.test_dir
+ '/java/'

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

@@ -7,17 +7,13 @@ 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": appication_type,
"type": self.get_application_type(),
"processes": {"spare": 0},
"working_directory": script_path,
"script": script_path + '/' + name,

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

@@ -7,17 +7,13 @@ 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": appication_type,
"type": self.get_application_type(),
"processes": {"spare": 0},
"root": script_path,
"working_directory": script_path,

7
test/unit/applications/lang/python.py
View File

@@ -34,11 +34,6 @@ class TestApplicationPython(TestApplicationProto):
script_path = '/app/python/' + name
appication_type = self.get_appication_type()
if appication_type is None:
appication_type = self.application_type
self._load_conf(
{
"listeners": {
@@ -46,7 +41,7 @@ class TestApplicationPython(TestApplicationProto):
},
"applications": {
name: {
"type": appication_type,
"type": self.get_application_type(),
"processes": {"spare": 0},
"path": script_path,
"working_directory": script_path,

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

@@ -7,17 +7,13 @@ 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": appication_type,
"type": self.get_application_type(),
"processes": {"spare": 0},
"working_directory": script_path,
"script": script_path + '/' + name,