Merge tag '1.32.0' into branches/packaging1.32.0-1

Unit 1.32.0 release.

7 files changed, 15 insertions, 17 deletions

diff --git a/test/unit/applications/lang/go.py b/test/unit/applications/lang/go.py
index 93e0738b..2479d4f6 100644
--- a/test/unit/applications/lang/go.py
+++ b/test/unit/applications/lang/go.py
@@ -53,7 +53,7 @@ class ApplicationGo(ApplicationProto):
 
         replace_path = f'{option.current_dir}/build/go/src/unit.nginx.org/go'
 
-        with open(f'{temp_dir}go.mod', 'w') as f:
+        with open(f'{temp_dir}go.mod', 'w', encoding='utf-8') as f:
             f.write(
                 f"""module test/app
 require unit.nginx.org/go v0.0.0
@@ -91,7 +91,7 @@ replace unit.nginx.org/go => {replace_path}
         ApplicationGo.prepare_env(script, name, static=static_build)
 
         conf = {
-            "listeners": {"*:7080": {"pass": f"applications/{script}"}},
+            "listeners": {"*:8080": {"pass": f"applications/{script}"}},
             "applications": {
                 script: {
                     "type": "external",
diff --git a/test/unit/applications/lang/java.py b/test/unit/applications/lang/java.py
index dc6d2bfc..351d04ce 100644
--- a/test/unit/applications/lang/java.py
+++ b/test/unit/applications/lang/java.py
@@ -53,7 +53,7 @@ class ApplicationJava(ApplicationProto):
                 os.makedirs(classes_path)
 
             classpath = (
-                f'{option.current_dir}/build/tomcat-servlet-api-9.0.82.jar'
+                f'{option.current_dir}/build/tomcat-servlet-api-9.0.86.jar'
             )
 
             ws_jars = glob.glob(
@@ -97,7 +97,7 @@ class ApplicationJava(ApplicationProto):
         script_path = f'{option.test_dir}/java/{script}/'
         self._load_conf(
             {
-                "listeners": {"*:7080": {"pass": f"applications/{script}"}},
+                "listeners": {"*:8080": {"pass": f"applications/{script}"}},
                 "applications": {
                     script: {
                         "unit_jars": f'{option.current_dir}/build',
diff --git a/test/unit/applications/lang/node.py b/test/unit/applications/lang/node.py
index 4f18c780..ff95fbd5 100644
--- a/test/unit/applications/lang/node.py
+++ b/test/unit/applications/lang/node.py
@@ -44,7 +44,7 @@ class ApplicationNode(ApplicationProto):
         self._load_conf(
             {
                 "listeners": {
-                    "*:7080": {"pass": f"applications/{quote(script, '')}"}
+                    "*:8080": {"pass": f"applications/{quote(script, '')}"}
                 },
                 "applications": {
                     script: {
diff --git a/test/unit/applications/lang/perl.py b/test/unit/applications/lang/perl.py
index 037e98e8..e99c2aca 100644
--- a/test/unit/applications/lang/perl.py
+++ b/test/unit/applications/lang/perl.py
@@ -11,7 +11,7 @@ class ApplicationPerl(ApplicationProto):
 
         self._load_conf(
             {
-                "listeners": {"*:7080": {"pass": f"applications/{script}"}},
+                "listeners": {"*:8080": {"pass": f"applications/{script}"}},
                 "applications": {
                     script: {
                         "type": self.get_application_type(),
diff --git a/test/unit/applications/lang/php.py b/test/unit/applications/lang/php.py
index b9b6dbf1..ac59ec1b 100644
--- a/test/unit/applications/lang/php.py
+++ b/test/unit/applications/lang/php.py
@@ -1,4 +1,4 @@
-import os
+from pathlib import Path
 import shutil
 
 from unit.applications.proto import ApplicationProto
@@ -15,10 +15,9 @@ class ApplicationPHP(ApplicationProto):
         if kwargs.get('isolation') and kwargs['isolation'].get('rootfs'):
             rootfs = kwargs['isolation']['rootfs']
 
-            if not os.path.exists(f'{rootfs}/app/php/'):
-                os.makedirs(f'{rootfs}/app/php/')
+            Path(f'{rootfs}/app/php/').mkdir(parents=True, exist_ok=True)
 
-            if not os.path.exists(f'{rootfs}/app/php/{script}'):
+            if not Path(f'{rootfs}/app/php/{script}').exists():
                 shutil.copytree(script_path, f'{rootfs}/app/php/{script}')
 
             script_path = f'/app/php/{script}'
@@ -42,7 +41,7 @@ class ApplicationPHP(ApplicationProto):
 
         self._load_conf(
             {
-                "listeners": {"*:7080": {"pass": f"applications/{script}"}},
+                "listeners": {"*:8080": {"pass": f"applications/{script}"}},
                 "applications": {script: app},
             },
             **kwargs,
diff --git a/test/unit/applications/lang/python.py b/test/unit/applications/lang/python.py
index 4e1fd897..67684b04 100644
--- a/test/unit/applications/lang/python.py
+++ b/test/unit/applications/lang/python.py
@@ -1,4 +1,4 @@
-import os
+from pathlib import Path
 import shutil
 from urllib.parse import quote
 
@@ -26,10 +26,9 @@ class ApplicationPython(ApplicationProto):
         if kwargs.get('isolation') and kwargs['isolation'].get('rootfs'):
             rootfs = kwargs['isolation']['rootfs']
 
-            if not os.path.exists(f'{rootfs}/app/python/'):
-                os.makedirs(f'{rootfs}/app/python/')
+            Path(f'{rootfs}/app/python/').mkdir(parents=True, exist_ok=True)
 
-            if not os.path.exists(f'{rootfs}/app/python/{name}'):
+            if not Path(f'{rootfs}/app/python/{name}').exists():
                 shutil.copytree(script_path, f'{rootfs}/app/python/{name}')
 
             script_path = f'/app/python/{name}'
@@ -59,7 +58,7 @@ class ApplicationPython(ApplicationProto):
         self._load_conf(
             {
                 "listeners": {
-                    "*:7080": {"pass": f"applications/{quote(name, '')}"}
+                    "*:8080": {"pass": f"applications/{quote(name, '')}"}
                 },
                 "applications": {name: app},
             },
diff --git a/test/unit/applications/lang/ruby.py b/test/unit/applications/lang/ruby.py
index f6c4f6c3..1268f8c7 100644
--- a/test/unit/applications/lang/ruby.py
+++ b/test/unit/applications/lang/ruby.py
@@ -37,7 +37,7 @@ class ApplicationRuby(ApplicationProto):
 
         self._load_conf(
             {
-                "listeners": {"*:7080": {"pass": f"applications/{script}"}},
+                "listeners": {"*:8080": {"pass": f"applications/{script}"}},
                 "applications": {script: app},
             },
             **kwargs,