refactor more tests

Author: snowch

pre_push_verifications.sh

@@ -9,7 +9,7 @@ black bin/ tests/ hpecp/
 #flake8 . --count --select=E9,F63,F7,F82 --show-source --statistics
 flake8 --exclude hpecp/role.py --docstring-convention numpy bin/ hpecp/
 
-flake8 --ignore=D,E501 tests/catalog_test.py tests/base_test.py tests/cli_test.py
+flake8 --ignore=D,E501 tests/catalog_test.py tests/base_test.py tests/cli_test.py tests/client_test.py tests/config_test.py tests/gateway_test.py
 
 tox -e py35 -- tests/
 

tests/client_test.py

@@ -92,7 +92,7 @@ class TestCreateFromEnvVar(TestCase):
     def test_create_from_env_var_factory_method_with_missing_env_values(self):
 
         try:
-            client = ContainerPlatformClient.create_from_env()
+            ContainerPlatformClient.create_from_env()
         except ContainerPlatformClientException as expected:
             self.assertEqual(
                 expected.message,
@@ -114,7 +114,7 @@ def test_create_from_env_var_factory_method_with_missing_env_values(self):
     def test_create_from_env_var_factory_method_with_type_error(self):
 
         try:
-            client = ContainerPlatformClient.create_from_env()
+            ContainerPlatformClient.create_from_env()
         except ContainerPlatformClientException as expected:
             self.assertEqual(
                 expected.message,

tests/gateway_test.py

@@ -18,26 +18,22 @@
 # ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
 # OTHER DEALINGS IN THE SOFTWARE.
 
-import os
-import sys
 import tempfile
-from textwrap import dedent
 from unittest import TestCase
 
 import requests
-import six
-from mock import Mock, patch
+from mock import patch
 
 from hpecp import APIItemNotFoundException, ContainerPlatformClient
 from hpecp.exceptions import APIItemConflictException
 from hpecp.gateway import GatewayController, GatewayStatus
 
 from .base_test import BaseTestCase
 
-if six.PY2:
-    from io import BytesIO as StringIO
-else:
-    from io import StringIO
+# if six.PY2:
+#     from io import BytesIO as StringIO
+# else:
+#     from io import StringIO
 
 
 class MockResponse:
@@ -1057,7 +1053,7 @@ def test_create_with_ssh_key_assertions(self, mock_post):
     @patch("requests.post", side_effect=mocked_requests_create_post)
     def test_create_with_ssh_key_returns_id(self, mock_post):
 
-        id = get_client().gateway.create_with_ssh_key(
+        get_client().gateway.create_with_ssh_key(
             ip="127.0.0.1",
             proxy_node_hostname="my.host.name",
             ssh_key_data="pem encoded key data",