summaryrefslogtreecommitdiffhomepage
path: root/test/test_reconfigure.py
diff options
context:
space:
mode:
authorAndrei Zeliankou <zelenkov@nginx.com>2023-06-14 18:20:09 +0100
committerAndrei Zeliankou <zelenkov@nginx.com>2023-06-14 18:20:09 +0100
commitc183bd8749a19477390f8cb77efe5f6d223f0905 (patch)
tree4e821e9cb07be9a86bf2d442acb3ea6740ba5a99 /test/test_reconfigure.py
parentc6d05191a069ac150cc8eb2bece75cf79c0a465a (diff)
downloadunit-c183bd8749a19477390f8cb77efe5f6d223f0905.tar.gz
unit-c183bd8749a19477390f8cb77efe5f6d223f0905.tar.bz2
Tests: get rid of classes in test files.
Class usage came from the unittest framework and it was always redundant after migration to the pytest. This commit removes classes from files containing tests to make them more readable and understandable.
Diffstat (limited to 'test/test_reconfigure.py')
-rw-r--r--test/test_reconfigure.py78
1 files changed, 41 insertions, 37 deletions
diff --git a/test/test_reconfigure.py b/test/test_reconfigure.py
index ae19db9d..53258b41 100644
--- a/test/test_reconfigure.py
+++ b/test/test_reconfigure.py
@@ -1,50 +1,54 @@
import time
import pytest
-from unit.applications.proto import TestApplicationProto
-
-
-class TestReconfigure(TestApplicationProto):
- @pytest.fixture(autouse=True)
- def setup_method_fixture(self):
- assert 'success' in self.conf(
- {
- "listeners": {"*:7080": {"pass": "routes"}},
- "routes": [{"action": {"return": 200}}],
- "applications": {},
- }
- )
-
- def clear_conf(self):
- assert 'success' in self.conf({"listeners": {}, "applications": {}})
-
- def test_reconfigure(self):
- sock = self.http(
- b"""GET / HTTP/1.1
+from unit.applications.proto import ApplicationProto
+
+client = ApplicationProto()
+
+
+@pytest.fixture(autouse=True)
+def setup_method_fixture():
+ assert 'success' in client.conf(
+ {
+ "listeners": {"*:7080": {"pass": "routes"}},
+ "routes": [{"action": {"return": 200}}],
+ "applications": {},
+ }
+ )
+
+
+def clear_conf():
+ assert 'success' in client.conf({"listeners": {}, "applications": {}})
+
+
+def test_reconfigure():
+ sock = client.http(
+ b"""GET / HTTP/1.1
""",
- raw=True,
- no_recv=True,
- )
+ raw=True,
+ no_recv=True,
+ )
- self.clear_conf()
+ clear_conf()
- resp = self.http(
- b"""Host: localhost
+ resp = client.http(
+ b"""Host: localhost
Connection: close
""",
- sock=sock,
- raw=True,
- )
- assert resp['status'] == 200, 'finish request'
+ sock=sock,
+ raw=True,
+ )
+ assert resp['status'] == 200, 'finish request'
+
- def test_reconfigure_2(self):
- sock = self.http(b'', raw=True, no_recv=True)
+def test_reconfigure_2():
+ sock = client.http(b'', raw=True, no_recv=True)
- # Waiting for connection completion.
- # Delay should be more than TCP_DEFER_ACCEPT.
- time.sleep(1.5)
+ # Waiting for connection completion.
+ # Delay should be more than TCP_DEFER_ACCEPT.
+ time.sleep(1.5)
- self.clear_conf()
+ clear_conf()
- assert self.get(sock=sock)['status'] == 408, 'request timeout'
+ assert client.get(sock=sock)['status'] == 408, 'request timeout'