test_logic.py - typo fixed.

`test_add_some_hdrs` is duplicate.Removed.

Author: RomanBelozerov

t_modify_http_headers/test_common_config.py

@@ -97,13 +97,6 @@ class TestReqAddHeader(AddHeaderBase):
         + "\r\n"
     )
 
-    def test_add_one_hdr(self):
-        client, server = self.base_scenario(
-            config=f'{self.directive} x-my-hdr "some text";\n',
-            expected_headers=[("x-my-hdr", "some text")],
-        )
-        return client, server
-
     def test_add_some_hdrs(self):
         client, server = self.base_scenario(
             config=(
@@ -190,76 +183,48 @@ class TestReqSetHeader(TestReqAddHeader):
         }
     ]
 
-    def test_add_one_hdr(self):
-        client, server = super(TestReqSetHeader, self).test_add_one_hdr()
+    def header_not_in(self, header):
+        server = self.get_server("deproxy")
+        self.assertNotIn(header, server.last_request.headers.items())
 
-        if self.directive == "req_hdr_set":
-            self.assertNotIn(("x-my-hdr", "original text"), server.last_request.headers.items())
-        else:
-            self.assertNotIn(("x-my-hdr", "original text"), client.last_response.headers.items())
+    def header_in(self, header):
+        server = self.get_server("deproxy")
+        self.assertIn(header, server.last_request.headers.items())
 
     def test_add_some_hdrs(self):
-        client, server = super(TestReqSetHeader, self).test_add_some_hdrs()
-
-        if self.directive == "req_hdr_set":
-            self.assertNotIn(("x-my-hdr", "original text"), server.last_request.headers.items())
-            self.assertNotIn(
-                ("x-my-hdr-2", "other original text"), server.last_request.headers.items()
-            )
-        else:
-            self.assertNotIn(("x-my-hdr", "original text"), client.last_response.headers.items())
-            self.assertNotIn(
-                ("x-my-hdr-2", "other original text"), client.last_response.headers.items()
-            )
+        super(TestReqSetHeader, self).test_add_some_hdrs()
+        self.header_not_in(("x-my-hdr", "original text"))
+        self.header_not_in(("x-my-hdr-2", "other original text"))
 
     def test_add_some_hdrs_custom_location(self):
-        client, server = super(TestReqSetHeader, self).test_add_some_hdrs_custom_location()
-
-        if self.directive == "req_hdr_set":
-            self.assertNotIn(("x-my-hdr", "original text"), server.last_request.headers.items())
-            self.assertNotIn(
-                ("x-my-hdr-2", "other original text"), server.last_request.headers.items()
-            )
-        else:
-            self.assertNotIn(("x-my-hdr", "original text"), client.last_response.headers.items())
-            self.assertNotIn(
-                ("x-my-hdr-2", "other original text"), client.last_response.headers.items()
-            )
+        super(TestReqSetHeader, self).test_add_some_hdrs_custom_location()
+        self.header_not_in(("x-my-hdr", "original text"))
+        self.header_not_in(("x-my-hdr-2", "other original text"))
 
     def test_add_hdrs_derive_config(self):
-        client, server = super(TestReqSetHeader, self).test_add_hdrs_derive_config()
-
-        if self.directive == "req_hdr_set":
-            self.assertNotIn(("x-my-hdr", "original text"), server.last_request.headers.items())
-            self.assertIn(
-                ("x-my-hdr-2", "other original text"), server.last_request.headers.items()
-            )
-        else:
-            self.assertNotIn(("x-my-hdr", "original text"), client.last_response.headers.items())
-            self.assertIn(
-                ("x-my-hdr-2", "other original text"), client.last_response.headers.items()
-            )
+        super(TestReqSetHeader, self).test_add_hdrs_derive_config()
+        self.header_not_in(("x-my-hdr", "original text"))
+        self.header_in(("x-my-hdr-2", "other original text"))
 
     def test_add_hdrs_override_config(self):
-        client, server = super(TestReqSetHeader, self).test_add_hdrs_override_config()
-
-        if self.directive == "req_hdr_set":
-            self.assertIn(("x-my-hdr", "original text"), server.last_request.headers.items())
-            self.assertNotIn(
-                ("x-my-hdr-2", "other original text"), server.last_request.headers.items()
-            )
-        else:
-            self.assertIn(("x-my-hdr", "original text"), client.last_response.headers.items())
-            self.assertNotIn(
-                ("x-my-hdr-2", "other original text"), client.last_response.headers.items()
-            )
+        super(TestReqSetHeader, self).test_add_hdrs_override_config()
+        self.header_in(("x-my-hdr", "original text"))
+        self.header_not_in(("x-my-hdr-2", "other original text"))
 
 
 class TestRespSetHeader(TestReqSetHeader):
     directive = "resp_hdr_set"
     cache = False
 
+    def header_in(self, header):
+        client = self.get_client("deproxy-1")
+        self.assertIn(header, client.last_response.headers.items())
+
+    def header_not_in(self, header):
+        client = self.get_client("deproxy-1")
+        self.assertNotIn(header, client.last_response.headers.items())
+
 
-class TestCachedRespSetHeader(TestReqSetHeader):
+class TestCachedRespSetHeader(TestRespSetHeader):
     cache = True
     directive = "resp_hdr_set"

t_modify_http_headers/test_common_config_h2.py

@@ -53,11 +53,11 @@ class TestReqSetHeaderH2(H2Config, test_common_config.TestReqSetHeader):
     ]
 
 
-class TestRespSetHeaderH2(H2Config, test_common_config.TestReqSetHeader):
+class TestRespSetHeaderH2(H2Config, test_common_config.TestRespSetHeader):
     cache = False
     directive = "resp_hdr_set"
 
 
-class TestCachedRespSetHeaderH2(H2Config, test_common_config.TestReqSetHeader):
+class TestCachedRespSetHeaderH2(H2Config, test_common_config.TestRespSetHeader):
     cache = True
     directive = "resp_hdr_set"

t_modify_http_headers/test_logic.py

@@ -98,15 +98,15 @@ def base_scenario(self, config: str, optional_headers: list, expected_headers: l
                 "200",
             )
 
-        expected_response = self.check_response(optional_headers, expected_headers, client)
+        expected_response = self.get_expected_response(optional_headers, expected_headers, client)
         expected_request = self.get_expected_request(optional_headers, expected_headers, client)
 
         self.assertEqual(expected_response, client.last_response)
         self.assertEqual(expected_request, server.last_request)
 
         return client, server
 
-    def check_response(
+    def get_expected_response(
         self, optional_headers: list, expected_headers: list, client
     ) -> Response or H2Response:
         if client.proto == "h2":
@@ -222,7 +222,7 @@ def test_delete_special_headers(self):
         """
         Headers must be removed from base request/response if header is in base request/response.
         """
-        header_name = "set-cookie" if self.directive == "resp" else "if-match"
+        header_name = "set-cookie" if self.directive == "resp" else "if-none-match"
         header_value = "test=cookie" if self.directive == "resp" else '"qwe"'
         client, server = self.base_scenario(
             config=f"{self.directive}_hdr_set {header_name};\n",