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/test_tls_conf_command.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'test/test_tls_conf_command.py')

diff --git a/test/test_tls_conf_command.py b/test/test_tls_conf_command.py
index 49df7bf3..4d772c83 100644
--- a/test/test_tls_conf_command.py
+++ b/test/test_tls_conf_command.py
@@ -15,7 +15,7 @@ def setup_method_fixture():
     assert 'success' in client.conf(
         {
             "listeners": {
-                "*:7080": {
+                "*:8080": {
                     "pass": "routes",
                     "tls": {"certificate": "default"},
                 }
@@ -55,7 +55,7 @@ def test_tls_conf_command():
             "certificate": "default",
             "conf_commands": {"protocol": f'-{protocol}'},
         },
-        'listeners/*:7080/tls',
+        'listeners/*:8080/tls',
     ), 'protocol disabled'
 
     sock.close()
@@ -84,7 +84,7 @@ def test_tls_conf_command():
                 "cipherstring": f"{cipher[1]}:!{cipher[0]}",
             },
         },
-        'listeners/*:7080/tls',
+        'listeners/*:8080/tls',
     ), 'cipher disabled'
 
     if len(ciphers) > 1:
@@ -106,7 +106,7 @@ def test_tls_conf_command_invalid(skip_alert):
     def check_conf_commands(conf_commands):
         assert 'error' in client.conf(
             {"certificate": "default", "conf_commands": conf_commands},
-            'listeners/*:7080/tls',
+            'listeners/*:8080/tls',
         ), 'ivalid conf_commands'
 
     check_conf_commands([])
-- 
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/test_tls_conf_command.py | 1 +
 1 file changed, 1 insertion(+)

(limited to 'test/test_tls_conf_command.py')

diff --git a/test/test_tls_conf_command.py b/test/test_tls_conf_command.py
index 4d772c83..5a9a3f32 100644
--- a/test/test_tls_conf_command.py
+++ b/test/test_tls_conf_command.py
@@ -1,6 +1,7 @@
 import ssl
 
 import pytest
+
 from unit.applications.tls import ApplicationTLS
 
 prerequisites = {'modules': {'openssl': 'any'}}
-- 
cgit