From ce2405ec3dd97e8bdf8f63312e3c6ce59ef562d4 Mon Sep 17 00:00:00 2001
From: Andrei Zeliankou <zelenkov@nginx.com>
Date: Mon, 12 Jun 2023 14:16:59 +0100
Subject: Tests: prerequisites checking reworked.

Prerequisites check moved to the module level to simplify class structure.
Discovery and prerequisites checks functions moved to the separate files.
Introduced "require" fixture to provide per-test requirements check.
---
 test/test_routing_tls.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'test/test_routing_tls.py')

diff --git a/test/test_routing_tls.py b/test/test_routing_tls.py
index 76cfb485..1ba79986 100644
--- a/test/test_routing_tls.py
+++ b/test/test_routing_tls.py
@@ -1,9 +1,9 @@
 from unit.applications.tls import TestApplicationTLS
 
+prerequisites = {'modules': {'openssl': 'any'}}
 
-class TestRoutingTLS(TestApplicationTLS):
-    prerequisites = {'modules': {'openssl': 'any'}}
 
+class TestRoutingTLS(TestApplicationTLS):
     def test_routes_match_scheme_tls(self):
         self.certificate()
 
-- 
cgit 


From c183bd8749a19477390f8cb77efe5f6d223f0905 Mon Sep 17 00:00:00 2001
From: Andrei Zeliankou <zelenkov@nginx.com>
Date: Wed, 14 Jun 2023 18:20:09 +0100
Subject: 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.
---
 test/test_routing_tls.py | 43 ++++++++++++++++++++++---------------------
 1 file changed, 22 insertions(+), 21 deletions(-)

(limited to 'test/test_routing_tls.py')

diff --git a/test/test_routing_tls.py b/test/test_routing_tls.py
index 1ba79986..4a97c8e4 100644
--- a/test/test_routing_tls.py
+++ b/test/test_routing_tls.py
@@ -1,28 +1,29 @@
-from unit.applications.tls import TestApplicationTLS
+from unit.applications.tls import ApplicationTLS
 
 prerequisites = {'modules': {'openssl': 'any'}}
 
+client = ApplicationTLS()
 
-class TestRoutingTLS(TestApplicationTLS):
-    def test_routes_match_scheme_tls(self):
-        self.certificate()
 
-        assert 'success' in self.conf(
-            {
-                "listeners": {
-                    "*:7080": {"pass": "routes"},
-                    "*:7081": {
-                        "pass": "routes",
-                        "tls": {"certificate": 'default'},
-                    },
+def test_routes_match_scheme_tls():
+    client.certificate()
+
+    assert 'success' in client.conf(
+        {
+            "listeners": {
+                "*:7080": {"pass": "routes"},
+                "*:7081": {
+                    "pass": "routes",
+                    "tls": {"certificate": 'default'},
                 },
-                "routes": [
-                    {"match": {"scheme": "http"}, "action": {"return": 200}},
-                    {"match": {"scheme": "https"}, "action": {"return": 201}},
-                ],
-                "applications": {},
-            }
-        ), 'scheme configure'
+            },
+            "routes": [
+                {"match": {"scheme": "http"}, "action": {"return": 200}},
+                {"match": {"scheme": "https"}, "action": {"return": 201}},
+            ],
+            "applications": {},
+        }
+    ), 'scheme configure'
 
-        assert self.get()['status'] == 200, 'http'
-        assert self.get_ssl(port=7081)['status'] == 201, 'https'
+    assert client.get()['status'] == 200, 'http'
+    assert client.get_ssl(port=7081)['status'] == 201, 'https'
-- 
cgit