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