more refactoring

snowch · snowch · commit 047476ef307e · 2020-08-03T22:21:57.000Z
Signed-off-by: Chris Snow &lt;chsnow123@gmail.com&gt;
diff --git a/tests/base.py b/tests/base.py
@@ -37,16 +37,6 @@
     from io import StringIO
 
 
-# def session_mock_response():
-#     return MockResponse(
-#         json_data={},
-#         status_code=200,
-#         headers={
-#             "location": "/api/v1/session/df1bfacb-xxxx-xxxx-xxxx-c8f57d8f3c71"
-#         },
-#     )
-
-
 class MockResponse:
     def __init__(
         self,
diff --git a/tests/catalog_mock_api_responses.py b/tests/catalog_mock_api_responses.py
@@ -21,7 +21,7 @@
 
 from hpecp.exceptions import APIItemNotFoundException
 
-from .base_test import BaseTestCase, MockResponse
+from .base import BaseTestCase, MockResponse
 
 
 def mockApiSetup():
diff --git a/tests/catalog_test.py b/tests/catalog_test.py
@@ -29,7 +29,7 @@
 from hpecp.base_resource import ResourceList
 from hpecp.exceptions import APIItemNotFoundException
 
-from .base_test import BaseTestCase, MockResponse, get_client
+from .base import BaseTestCase, MockResponse, get_client
 from .catalog_mock_api_responses import mockApiSetup
 
 # setup the mock data
diff --git a/tests/cli_mock_api_responses.py b/tests/cli_mock_api_responses.py
@@ -21,7 +21,7 @@
 
 from hpecp.exceptions import APIItemNotFoundException
 
-from .base_test import BaseTestCase, MockResponse
+from .base import BaseTestCase, MockResponse
 
 
 def mockApiSetup():
diff --git a/tests/cli_test.py b/tests/cli_test.py
@@ -31,7 +31,7 @@
 from hpecp.cli import base
 from hpecp.gateway import Gateway
 
-from .base_test import BaseTestCase, MockResponse
+from .base import BaseTestCase, MockResponse
 from .cli_mock_api_responses import mockApiSetup
 
 # setup the mock data
diff --git a/tests/client_mock_api_responses.py b/tests/client_mock_api_responses.py
@@ -21,7 +21,7 @@
 
 from hpecp.exceptions import APIItemNotFoundException
 
-from .base_test import BaseTestCase, MockResponse
+from .base import BaseTestCase, MockResponse
 
 
 def mockApiSetup():
diff --git a/tests/client_test.py b/tests/client_test.py
@@ -28,7 +28,7 @@
 
 from hpecp import ContainerPlatformClient, ContainerPlatformClientException
 
-from .base_test import BaseTestCase, MockResponse
+from .base import BaseTestCase, MockResponse
 from .client_mock_api_responses import mockApiSetup
 
 # setup the mock data
diff --git a/tests/config_mock_api_responses.py b/tests/config_mock_api_responses.py
@@ -19,7 +19,7 @@
 # OTHER DEALINGS IN THE SOFTWARE.
 
 
-from .base_test import BaseTestCase, MockResponse
+from .base import BaseTestCase, MockResponse
 
 
 def mockApiSetup():
diff --git a/tests/config_test.py b/tests/config_test.py
@@ -25,7 +25,7 @@
 
 from hpecp import ContainerPlatformClient
 
-from .base_test import BaseTestCase, MockResponse
+from .base import BaseTestCase, MockResponse
 from .config_mock_api_responses import mockApiSetup
 
 # setup the mock data
diff --git a/tests/gateway_mock_api_responses.py b/tests/gateway_mock_api_responses.py
@@ -19,7 +19,7 @@
 # OTHER DEALINGS IN THE SOFTWARE.
 
 
-from .base_test import BaseTestCase, MockResponse
+from .base import BaseTestCase, MockResponse
 
 
 def mockApiGetSetup():
diff --git a/tests/gateway_test.py b/tests/gateway_test.py
@@ -28,7 +28,7 @@
 from hpecp.exceptions import APIItemConflictException
 from hpecp.gateway import GatewayController, GatewayStatus
 
-from .base_test import BaseTestCase, MockResponse, get_client
+from .base import BaseTestCase, MockResponse, get_client
 from .gateway_mock_api_responses import mockApiGetSetup, mockApiPostSetup
 
 
diff --git a/tests/k8s_cluster_mock_api_responses.py b/tests/k8s_cluster_mock_api_responses.py
@@ -19,7 +19,7 @@
 # OTHER DEALINGS IN THE SOFTWARE.
 
 
-from .base_test import BaseTestCase, MockResponse
+from .base import BaseTestCase, MockResponse
 
 
 def mockApiSetup():
diff --git a/tests/k8s_cluster_test.py b/tests/k8s_cluster_test.py
@@ -30,7 +30,7 @@
     K8sClusterStatus,
 )
 
-from .base_test import BaseTestCase, MockResponse, get_client
+from .base import BaseTestCase, MockResponse, get_client
 from .k8s_cluster_mock_api_responses import mockApiSetup
 
 # setup the mock data
diff --git a/tests/k8s_worker_mock_api_responses.py b/tests/k8s_worker_mock_api_responses.py
@@ -19,7 +19,7 @@
 # OTHER DEALINGS IN THE SOFTWARE.
 
 
-from .base_test import BaseTestCase, MockResponse
+from .base import BaseTestCase, MockResponse
 
 
 def mockApiSetup():
diff --git a/tests/k8s_worker_test.py b/tests/k8s_worker_test.py
@@ -7,7 +7,7 @@
 from hpecp.exceptions import APIItemConflictException, APIItemNotFoundException
 from hpecp.k8s_worker import K8sWorkerController, WorkerK8s, WorkerK8sStatus
 
-from .base_test import BaseTestCase, MockResponse, get_client
+from .base import BaseTestCase, MockResponse, get_client
 from .k8s_worker_mock_api_responses import mockApiSetup
 
 # setup the mock data
diff --git a/tests/license_mock_api_responses.py b/tests/license_mock_api_responses.py
@@ -19,7 +19,7 @@
 # OTHER DEALINGS IN THE SOFTWARE.
 
 
-from .base_test import BaseTestCase, MockResponse
+from .base import BaseTestCase, MockResponse
 
 
 def mockApiSetup():
diff --git a/tests/license_test.py b/tests/license_test.py
@@ -24,7 +24,7 @@
 import six
 from mock import patch
 
-from .base_test import BaseTestCase, MockResponse
+from .base import BaseTestCase, MockResponse
 from .license_mock_api_responses import mockApiSetup
 
 # setup the mock data
diff --git a/tests/lock_mock_api_responses.py b/tests/lock_mock_api_responses.py
@@ -19,7 +19,7 @@
 # OTHER DEALINGS IN THE SOFTWARE.
 
 
-from .base_test import BaseTestCase, MockResponse
+from .base import BaseTestCase, MockResponse
 
 
 def mockApiSetup():
diff --git a/tests/lock_test.py b/tests/lock_test.py
@@ -24,7 +24,7 @@
 import six
 from mock import patch
 
-from .base_test import BaseTestCase, MockResponse
+from .base import BaseTestCase, MockResponse
 from .lock_mock_api_responses import mockApiSetup
 
 # setup the mock data
diff --git a/tests/role_mock_api_responses.py b/tests/role_mock_api_responses.py
@@ -19,7 +19,7 @@
 # OTHER DEALINGS IN THE SOFTWARE.
 
 
-from .base_test import BaseTestCase, MockResponse
+from .base import BaseTestCase, MockResponse
 
 
 def mockApiSetup():
diff --git a/tests/role_test.py b/tests/role_test.py
@@ -27,7 +27,7 @@
 
 from hpecp import ContainerPlatformClient
 
-from .base_test import BaseTestCase, MockResponse, get_client
+from .base import BaseTestCase, MockResponse, get_client
 from .role_mock_api_responses import mockApiSetup
 
 # setup the mock data
diff --git a/tests/tenant_mock_api_responses.py b/tests/tenant_mock_api_responses.py
@@ -19,7 +19,7 @@
 # OTHER DEALINGS IN THE SOFTWARE.
 
 
-from .base_test import BaseTestCase, MockResponse
+from .base import BaseTestCase, MockResponse
 
 
 def mockApiSetup():
diff --git a/tests/tenant_test.py b/tests/tenant_test.py
@@ -26,7 +26,7 @@
 from hpecp import ContainerPlatformClient
 from hpecp.exceptions import APIItemNotFoundException
 
-from .base_test import BaseTestCase, MockResponse, get_client
+from .base import BaseTestCase, MockResponse, get_client
 from .tenant_mock_api_responses import mockApiSetup
 
 # setup the mock data
diff --git a/tests/user_mock_api_responses.py b/tests/user_mock_api_responses.py
@@ -19,7 +19,7 @@
 # OTHER DEALINGS IN THE SOFTWARE.
 
 
-from .base_test import BaseTestCase, MockResponse
+from .base import BaseTestCase, MockResponse
 
 
 def mockApiSetup():
diff --git a/tests/user_test.py b/tests/user_test.py
@@ -26,7 +26,7 @@
 from hpecp import ContainerPlatformClient
 from hpecp.exceptions import APIItemNotFoundException
 
-from .base_test import BaseTestCase, MockResponse, get_client
+from .base import BaseTestCase, MockResponse, get_client
 from .user_mock_api_responses import mockApiSetup
 
 # setup the mock data
