From 0b85fe29f7e49c88cab88aa9303d5885fa9c9dd5 Mon Sep 17 00:00:00 2001
From: Andrei Zeliankou <zelenkov@nginx.com>
Date: Wed, 8 Nov 2023 18:37:02 +0000
Subject: Tests: 8XXX used as default port range.

After the launch of the project, the testing infrastructure was shared with
nginx project in some cases.  To avoid port overlap, a decision was made
to shift the port range for Unit tests.  This problem was resolved a long time
ago and is no longer relevant, so it is now safe to use port 8XXX range as the
default, as it is more appropriate for testing purposes.
---
 test/unit/check/isolation.py | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'test/unit/check/isolation.py')

diff --git a/test/unit/check/isolation.py b/test/unit/check/isolation.py
index e4674f4d..e31179e8 100644
--- a/test/unit/check/isolation.py
+++ b/test/unit/check/isolation.py
@@ -21,7 +21,7 @@ def check_isolation():
         ApplicationGo().prepare_env('empty', 'app')
 
         conf = {
-            "listeners": {"*:7080": {"pass": "applications/empty"}},
+            "listeners": {"*:8080": {"pass": "applications/empty"}},
             "applications": {
                 "empty": {
                     "type": "external",
@@ -35,7 +35,7 @@ def check_isolation():
 
     elif 'python' in available['modules']:
         conf = {
-            "listeners": {"*:7080": {"pass": "applications/empty"}},
+            "listeners": {"*:8080": {"pass": "applications/empty"}},
             "applications": {
                 "empty": {
                     "type": "python",
@@ -50,7 +50,7 @@ def check_isolation():
 
     elif 'php' in available['modules']:
         conf = {
-            "listeners": {"*:7080": {"pass": "applications/phpinfo"}},
+            "listeners": {"*:8080": {"pass": "applications/phpinfo"}},
             "applications": {
                 "phpinfo": {
                     "type": "php",
@@ -67,7 +67,7 @@ def check_isolation():
         ApplicationRuby().prepare_env('empty')
 
         conf = {
-            "listeners": {"*:7080": {"pass": "applications/empty"}},
+            "listeners": {"*:8080": {"pass": "applications/empty"}},
             "applications": {
                 "empty": {
                     "type": "ruby",
@@ -83,7 +83,7 @@ def check_isolation():
         ApplicationJava().prepare_env('empty')
 
         conf = {
-            "listeners": {"*:7080": {"pass": "applications/empty"}},
+            "listeners": {"*:8080": {"pass": "applications/empty"}},
             "applications": {
                 "empty": {
                     "unit_jars": f"{option.current_dir}/build",
@@ -100,7 +100,7 @@ def check_isolation():
         ApplicationNode().prepare_env('basic')
 
         conf = {
-            "listeners": {"*:7080": {"pass": "applications/basic"}},
+            "listeners": {"*:8080": {"pass": "applications/basic"}},
             "applications": {
                 "basic": {
                     "type": "external",
@@ -114,7 +114,7 @@ def check_isolation():
 
     elif 'perl' in available['modules']:
         conf = {
-            "listeners": {"*:7080": {"pass": "applications/body_empty"}},
+            "listeners": {"*:8080": {"pass": "applications/body_empty"}},
             "applications": {
                 "body_empty": {
                     "type": "perl",
-- 
cgit 


From 5a8337933df1cf3aba967d86549e236dd9173386 Mon Sep 17 00:00:00 2001
From: Andrei Zeliankou <zelenkov@nginx.com>
Date: Mon, 15 Jan 2024 15:48:58 +0000
Subject: Tests: pathlib used where appropriate

Also fixed various pylint errors and style issues.
---
 test/unit/check/isolation.py | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

(limited to 'test/unit/check/isolation.py')

diff --git a/test/unit/check/isolation.py b/test/unit/check/isolation.py
index e31179e8..861c0818 100644
--- a/test/unit/check/isolation.py
+++ b/test/unit/check/isolation.py
@@ -1,5 +1,5 @@
 import json
-import os
+from pathlib import Path
 
 from unit.applications.lang.go import ApplicationGo
 from unit.applications.lang.java import ApplicationJava
@@ -145,11 +145,12 @@ def check_isolation():
 
     isolation = {'user': userns}
 
-    unp_clone_path = '/proc/sys/kernel/unprivileged_userns_clone'
-    if os.path.exists(unp_clone_path):
-        with open(unp_clone_path, 'r') as f:
-            if str(f.read()).rstrip() == '1':
-                isolation['unprivileged_userns_clone'] = True
+    path_clone = Path('/proc/sys/kernel/unprivileged_userns_clone')
+    if (
+        path_clone.exists()
+        and path_clone.read_text(encoding='utf-8').rstrip() == '1'
+    ):
+        isolation['unprivileged_userns_clone'] = True
 
     for ns in allns:
         ns_value = getns(ns)
-- 
cgit