Move http module in imports and mock patches

Author: timopollmeier

tests/protocols/http/core/test_api.py

@@ -11,12 +11,12 @@
 class GvmHttpApiTestCase(unittest.TestCase):
     # pylint: disable=protected-access
 
-    @patch("gvm.http.core.connector.HttpApiConnector")
+    @patch("gvm.protocols.http.core.connector.HttpApiConnector")
     def test_basic_init(self, connector_mock: MagicMock):
         api = GvmHttpApi(connector_mock)
         self.assertEqual(connector_mock, api._connector)
 
-    @patch("gvm.http.core.connector.HttpApiConnector")
+    @patch("gvm.protocols.http.core.connector.HttpApiConnector")
     def test_init_with_key(self, connector_mock: MagicMock):
         api = GvmHttpApi(connector_mock, api_key="my-api-key")
         self.assertEqual(connector_mock, api._connector)

tests/protocols/http/core/test_connector.py

@@ -12,7 +12,7 @@
 from httpx import HTTPError
 
 from gvm.protocols.http.core.connector import HttpApiConnector
-from gvm.protocols.http.core import ContentType
+from gvm.protocols.http.core.headers import ContentType
 
 TEST_JSON_HEADERS = {
     "content-type": "application/json;charset=utf-8",
@@ -115,7 +115,7 @@ def test_new_session(self):
         new_client = HttpApiConnector._new_client()
         self.assertIsInstance(new_client, httpx.Client)
 
-    @patch("gvm.http.core.connector.HttpApiConnector._new_client")
+    @patch("gvm.protocols.http.core.connector.HttpApiConnector._new_client")
     def test_basic_init(self, new_client_mock: MagicMock):
         mock_client = new_client_mock.return_value = new_mock_client()
 
@@ -125,7 +125,7 @@ def test_basic_init(self, new_client_mock: MagicMock):
         new_client_mock.assert_called_once_with(None, None)
         self.assertEqual({}, mock_client.headers)
 
-    @patch("gvm.http.core.connector.HttpApiConnector._new_client")
+    @patch("gvm.protocols.http.core.connector.HttpApiConnector._new_client")
     def test_https_init(self, new_client_mock: MagicMock):
         mock_client = new_client_mock.return_value = new_mock_client()
 
@@ -139,7 +139,7 @@ def test_https_init(self, new_client_mock: MagicMock):
         new_client_mock.assert_called_once_with("foo.crt", "bar.key")
         self.assertEqual({}, mock_client.headers)
 
-    @patch("gvm.http.core.connector.HttpApiConnector._new_client")
+    @patch("gvm.protocols.http.core.connector.HttpApiConnector._new_client")
     def test_update_headers(self, new_client_mock: MagicMock):
         mock_client = new_client_mock.return_value = new_mock_client()
 
@@ -151,7 +151,7 @@ def test_update_headers(self, new_client_mock: MagicMock):
 
         self.assertEqual({"x-foo": "bar", "x-baz": "123"}, mock_client.headers)
 
-    @patch("gvm.http.core.connector.HttpApiConnector._new_client")
+    @patch("gvm.protocols.http.core.connector.HttpApiConnector._new_client")
     def test_delete(self, new_client_mock: MagicMock):
         mock_client = new_client_mock.return_value = new_mock_client()
 
@@ -176,7 +176,7 @@ def test_delete(self, new_client_mock: MagicMock):
             headers={"baz": "456"},
         )
 
-    @patch("gvm.http.core.connector.HttpApiConnector._new_client")
+    @patch("gvm.protocols.http.core.connector.HttpApiConnector._new_client")
     def test_minimal_delete(self, new_client_mock: MagicMock):
         mock_client = new_client_mock.return_value = new_mock_client()
 
@@ -193,7 +193,7 @@ def test_minimal_delete(self, new_client_mock: MagicMock):
             "https://localhost/foo", params=None, headers=None
         )
 
-    @patch("gvm.http.core.connector.HttpApiConnector._new_client")
+    @patch("gvm.protocols.http.core.connector.HttpApiConnector._new_client")
     def test_delete_raise_on_status(self, new_client_mock: MagicMock):
         mock_client = new_client_mock.return_value = new_mock_client()
 
@@ -207,7 +207,7 @@ def test_delete_raise_on_status(self, new_client_mock: MagicMock):
             "https://localhost/foo", params=None, headers=None
         )
 
-    @patch("gvm.http.core.connector.HttpApiConnector._new_client")
+    @patch("gvm.protocols.http.core.connector.HttpApiConnector._new_client")
     def test_delete_no_raise_on_status(self, new_client_mock: MagicMock):
         mock_client = new_client_mock.return_value = new_mock_client()
 
@@ -237,7 +237,7 @@ def test_delete_no_raise_on_status(self, new_client_mock: MagicMock):
             headers={"baz": "456"},
         )
 
-    @patch("gvm.http.core.connector.HttpApiConnector._new_client")
+    @patch("gvm.protocols.http.core.connector.HttpApiConnector._new_client")
     def test_get(self, new_client_mock: MagicMock):
         mock_client = new_client_mock.return_value = new_mock_client()
 
@@ -262,7 +262,7 @@ def test_get(self, new_client_mock: MagicMock):
             headers={"baz": "456"},
         )
 
-    @patch("gvm.http.core.connector.HttpApiConnector._new_client")
+    @patch("gvm.protocols.http.core.connector.HttpApiConnector._new_client")
     def test_minimal_get(self, new_client_mock: MagicMock):
         mock_client = new_client_mock.return_value = new_mock_client()
 
@@ -279,7 +279,7 @@ def test_minimal_get(self, new_client_mock: MagicMock):
             "https://localhost/foo", params=None, headers=None
         )
 
-    @patch("gvm.http.core.connector.HttpApiConnector._new_client")
+    @patch("gvm.protocols.http.core.connector.HttpApiConnector._new_client")
     def test_get_raise_on_status(self, new_client_mock: MagicMock):
         mock_client = new_client_mock.return_value = new_mock_client()
 
@@ -293,7 +293,7 @@ def test_get_raise_on_status(self, new_client_mock: MagicMock):
             "https://localhost/foo", params=None, headers=None
         )
 
-    @patch("gvm.http.core.connector.HttpApiConnector._new_client")
+    @patch("gvm.protocols.http.core.connector.HttpApiConnector._new_client")
     def test_get_no_raise_on_status(self, new_client_mock: MagicMock):
         mock_client = new_client_mock.return_value = new_mock_client()
 
@@ -323,7 +323,7 @@ def test_get_no_raise_on_status(self, new_client_mock: MagicMock):
             headers={"baz": "456"},
         )
 
-    @patch("gvm.http.core.connector.HttpApiConnector._new_client")
+    @patch("gvm.protocols.http.core.connector.HttpApiConnector._new_client")
     def test_post_json(self, new_client_mock: MagicMock):
         mock_client = new_client_mock.return_value = new_mock_client()
 
@@ -352,7 +352,7 @@ def test_post_json(self, new_client_mock: MagicMock):
             headers={"baz": "456"},
         )
 
-    @patch("gvm.http.core.connector.HttpApiConnector._new_client")
+    @patch("gvm.protocols.http.core.connector.HttpApiConnector._new_client")
     def test_minimal_post_json(self, new_client_mock: MagicMock):
         mock_client = new_client_mock.return_value = new_mock_client()
 
@@ -372,7 +372,7 @@ def test_minimal_post_json(self, new_client_mock: MagicMock):
             headers=None,
         )
 
-    @patch("gvm.http.core.connector.HttpApiConnector._new_client")
+    @patch("gvm.protocols.http.core.connector.HttpApiConnector._new_client")
     def test_post_json_raise_on_status(self, new_client_mock: MagicMock):
         mock_client = new_client_mock.return_value = new_mock_client()
 
@@ -391,7 +391,7 @@ def test_post_json_raise_on_status(self, new_client_mock: MagicMock):
             headers=None,
         )
 
-    @patch("gvm.http.core.connector.HttpApiConnector._new_client")
+    @patch("gvm.protocols.http.core.connector.HttpApiConnector._new_client")
     def test_post_json_no_raise_on_status(self, new_client_mock: MagicMock):
         mock_client = new_client_mock.return_value = new_mock_client()
 

tests/protocols/http/core/test_headers.py

@@ -4,7 +4,7 @@
 
 import unittest
 
-from gvm.protocols.http.core import ContentType
+from gvm.protocols.http.core.headers import ContentType
 
 
 class ContentTypeTestCase(unittest.TestCase):