more test refactoring

Signed-off-by: Chris Snow <[email protected]>

Author: snowch

Dockerfile

@@ -10,7 +10,7 @@ RUN sudo apt-get update \
 
 # FIXME: Python 3.9 returns errors with pip
 RUN echo "Installing python modules" \
-    && for v in 2 3 3.5 3.6 3.7 3.8; do python${v} -m pip install -U pylint pytest mock nose flake8-docstrings flake8-per-file-ignores==0.8.1; done \
+    && for v in 2 3 3.5 3.6 3.7 3.8; do python${v} -m pip install -U pylint pytest mock nose flake8-docstrings flake8-per-file-ignores==0.8.1 isort; done \
     && for v in 3 3.5 3.6 3.7 3.8; do python${v} -m pip install -U black; done \
     && sudo ln -s /home/theia/.local/bin//black /bin/ \
     && for v in 2 3 3.5 3.6 3.7 3.8; do python${v} -m pip install -r /tmp/requirements.txt; done 

pre_push_verifications.sh

@@ -2,8 +2,9 @@
 
 set -e
 
-isort --check-only bin/*.py hpecp/**.py tests/*.py
-
+isort tests/*.py
+isort hpecp/**.py
+isort bin/*.py
 
 black bin/ tests/ hpecp/
 

tests/client_mock_api_responses.py

@@ -0,0 +1,41 @@
+# (C) Copyright [2020] Hewlett Packard Enterprise Development LP
+#
+# Permission is hereby granted, free of charge, to any person obtaining a
+# copy of this software and associated documentation files (the "Software"),
+# to deal in the Software without restriction, including without limitation
+# the rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Software, and to permit persons to whom the
+# Software is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included
+# in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+# OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+# ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+# OTHER DEALINGS IN THE SOFTWARE.
+
+
+from hpecp.exceptions import APIItemNotFoundException
+
+from .base_test import BaseTestCase, MockResponse
+
+
+def mockApiSetup():
+
+    # Mock http (not https) session
+    BaseTestCase.registerHttpPostHandler(
+        "http://127.0.0.1:8080/api/v1/login",
+        MockResponse(
+            json_data={},
+            status_code=200,
+            headers={
+                "location": (
+                    "/api/v1/session/df1bfacb-ssl-false-xxxx-c8f57d8f3c72"
+                )
+            },
+        ),
+    )

tests/client_test.py

@@ -28,31 +28,11 @@
 
 from hpecp import ContainerPlatformClient, ContainerPlatformClientException
 
+from .base_test import BaseTestCase, MockResponse
+from .client_mock_api_responses import mockApiSetup
 
-class MockResponse:
-    def __init__(
-        self,
-        json_data,
-        status_code,
-        headers,
-        raise_for_status_flag=False,
-        text_data="",
-    ):
-        self.json_data = json_data
-        self.text = text_data
-        self.status_code = status_code
-        self.raise_for_status_flag = raise_for_status_flag
-        self.headers = headers
-
-    def raise_for_status(self):
-        if self.raise_for_status_flag:
-            self.text = "some error occurred"
-            raise requests.exceptions.HTTPError()
-        else:
-            return
-
-    def json(self):
-        return self.json_data
+# setup the mock data
+mockApiSetup()
 
 
 class TestCreateFromProperties(TestCase):
@@ -170,23 +150,8 @@ def test_create_from_env_var_factory_method_with_falses(self):
         self.assertEqual(client.warn_ssl, False)
 
 
-class TestAuth(TestCase):
-
-    # pylint: disable=no-method-argument
-    def mocked_requests_post(*args, **kwargs):
-        if args[0] == "http://127.0.0.1:8080/api/v1/login":
-            return MockResponse(
-                json_data={},
-                status_code=200,
-                headers={
-                    "location": (
-                        "/api/v1/session/df1bfacb-xxxx-xxxx-xxxx-c8f57d8f3c71"
-                    )
-                },
-            )
-        raise RuntimeError("Unhandle POST request: " + args[0])
-
-    @patch("requests.post", side_effect=mocked_requests_post)
+class TestAuth(BaseTestCase):
+    @patch("requests.post", side_effect=BaseTestCase.httpPostHandlers)
     def test_create_session(self, mock_post):
 
         client = ContainerPlatformClient(
@@ -199,7 +164,7 @@ def test_create_session(self, mock_post):
 
         self.assertIsInstance(client.create_session(), ContainerPlatformClient)
 
-    @patch("requests.post", side_effect=mocked_requests_post)
+    @patch("requests.post", side_effect=BaseTestCase.httpPostHandlers)
     def test_create_session_chained(self, mock_post):
 
         client = ContainerPlatformClient(
@@ -212,20 +177,7 @@ def test_create_session_chained(self, mock_post):
 
         self.assertIsInstance(client, ContainerPlatformClient)
 
-    def mocked_requests_post_ssl(*args, **kwargs):
-        if args[0] == "https://127.0.0.1:8080/api/v1/login":
-            return MockResponse(
-                json_data={},
-                status_code=200,
-                headers={
-                    "location": (
-                        "/api/v1/session/df1bfacb-xxxx-xxxx-xxxx-c8f57d8f3c71"
-                    )
-                },
-            )
-        raise RuntimeError("Unhandle POST request: " + args[0])
-
-    @patch("requests.post", side_effect=mocked_requests_post_ssl)
+    @patch("requests.post", side_effect=BaseTestCase.httpPostHandlers)
     def test_auth_ssl(self, mock_post):
 
         client = ContainerPlatformClient(

tests/role_test.py

@@ -27,12 +27,7 @@
 
 from hpecp import ContainerPlatformClient
 
-from .base_test import (
-    BaseTestCase,
-    MockResponse,
-    get_client,
-    session_mock_response,
-)
+from .base_test import BaseTestCase, MockResponse, get_client
 from .role_mock_api_responses import mockApiSetup
 
 # setup the mock data