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_rewrite.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'test/test_rewrite.py')

diff --git a/test/test_rewrite.py b/test/test_rewrite.py
index 8d81ec49..0a4ffe42 100644
--- a/test/test_rewrite.py
+++ b/test/test_rewrite.py
@@ -10,7 +10,7 @@ client = ApplicationProto()
 def setup_method_fixture():
     assert 'success' in client.conf(
         {
-            "listeners": {"*:7080": {"pass": "routes"}},
+            "listeners": {"*:8080": {"pass": "routes"}},
             "routes": [
                 {
                     "match": {"uri": "/"},
@@ -112,7 +112,7 @@ def test_rewrite_location():
     def check_location(rewrite, expect):
         assert 'success' in client.conf(
             {
-                "listeners": {"*:7080": {"pass": "routes"}},
+                "listeners": {"*:8080": {"pass": "routes"}},
                 "routes": [
                     {
                         "action": {
@@ -141,7 +141,7 @@ def test_rewrite_share(temp_dir):
 
     assert 'success' in client.conf(
         {
-            "listeners": {"*:7080": {"pass": "routes"}},
+            "listeners": {"*:8080": {"pass": "routes"}},
             "routes": [
                 {
                     "action": {
@@ -162,7 +162,7 @@ def test_rewrite_share(temp_dir):
     index_path = f'{temp_dir}${{request_uri}}/index.html'
     assert 'success' in client.conf(
         {
-            "listeners": {"*:7080": {"pass": "routes"}},
+            "listeners": {"*:8080": {"pass": "routes"}},
             "routes": [
                 {
                     "match": {"uri": "/foo"},
@@ -182,7 +182,7 @@ def test_rewrite_share(temp_dir):
 
     assert 'success' in client.conf(
         {
-            "listeners": {"*:7080": {"pass": "routes"}},
+            "listeners": {"*:8080": {"pass": "routes"}},
             "routes": [
                 {
                     "match": {"uri": "/foo"},
-- 
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_rewrite.py | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

(limited to 'test/test_rewrite.py')

diff --git a/test/test_rewrite.py b/test/test_rewrite.py
index 0a4ffe42..f94fb528 100644
--- a/test/test_rewrite.py
+++ b/test/test_rewrite.py
@@ -1,6 +1,7 @@
-import os
+from pathlib import Path
 
 import pytest
+
 from unit.applications.proto import ApplicationProto
 
 client = ApplicationProto()
@@ -39,9 +40,9 @@ def set_rewrite(rewrite, uri):
 
 def test_rewrite(findall, wait_for_record):
     assert client.get()['status'] == 200
-    assert wait_for_record(rf'\[notice\].*"routes/1" selected') is not None
-    assert len(findall(rf'\[notice\].*URI rewritten to "/new"')) == 1
-    assert len(findall(rf'\[notice\].*URI rewritten')) == 1
+    assert wait_for_record(r'\[notice\].*"routes/1" selected') is not None
+    assert len(findall(r'\[notice\].*URI rewritten to "/new"')) == 1
+    assert len(findall(r'\[notice\].*URI rewritten')) == 1
 
     set_rewrite("", "")
     assert client.get()['status'] == 200
@@ -131,11 +132,9 @@ def test_rewrite_location():
 
 
 def test_rewrite_share(temp_dir):
-    os.makedirs(f'{temp_dir}/dir')
-    os.makedirs(f'{temp_dir}/foo')
-
-    with open(f'{temp_dir}/foo/index.html', 'w') as fooindex:
-        fooindex.write('fooindex')
+    Path(f'{temp_dir}/dir').mkdir()
+    Path(f'{temp_dir}/foo/').mkdir()
+    Path(f'{temp_dir}/foo/index.html').write_text('fooindex', encoding='utf-8')
 
     # same action block
 
-- 
cgit