refactor(test): code clean up

Author: Brooke-white

test/conftest.py

@@ -1,6 +1,7 @@
 import configparser
 import os
 import sys
+import typing
 
 import pytest  # type: ignore
 
@@ -24,7 +25,7 @@
 #             f.write(rep.longreprtext + "\n")
 
 
-def _get_default_connection_args():
+def _get_default_connection_args() -> typing.Dict[str, typing.Union[str, bool, int]]:
     """
     Helper function defining default database connection parameter values.
     Returns
@@ -44,7 +45,7 @@ def _get_default_connection_args():
     }
 
 
-def _get_default_iam_connection_args():
+def _get_default_iam_connection_args() -> typing.Dict[str, typing.Union[str, bool, int]]:
     args = _get_default_connection_args()
     del args["host"]
     del args["port"]
@@ -53,16 +54,16 @@ def _get_default_iam_connection_args():
 
 
 @pytest.fixture(scope="class")
-def db_kwargs():
+def db_kwargs() -> typing.Dict[str, typing.Union[str, bool, int]]:
     return _get_default_connection_args()
 
 
-def db_groups():
+def db_groups() -> typing.List[str]:
     return conf.get("cluster-setup", "groups", fallback="mock_groups").split(sep=",")
 
 
 @pytest.fixture(scope="class")
-def perf_db_kwargs():
+def perf_db_kwargs() -> typing.Dict[str, typing.Union[str, bool]]:
     db_connect = {
         "database": conf.get("performance-database", "database", fallback="mock_database"),
         "host": conf.get("performance-database", "host", fallback="mock_host"),
@@ -76,7 +77,7 @@ def perf_db_kwargs():
 
 
 @pytest.fixture(scope="class")
-def okta_idp():
+def okta_idp() -> typing.Dict[str, typing.Union[str, bool, int]]:
     db_connect = {
         "db_user": conf.get("ci-cluster", "test_user", fallback="mock_test_user"),
         "password": conf.get("okta-idp", "password", fallback="mock_password"),
@@ -91,7 +92,7 @@ def okta_idp():
 
 
 @pytest.fixture(scope="class")
-def okta_browser_idp():
+def okta_browser_idp() -> typing.Dict[str, typing.Union[str, bool, int]]:
     db_connect = {
         "db_user": conf.get("ci-cluster", "test_user", fallback="mock_test_user"),
         "password": conf.get("okta-browser-idp", "password", fallback="mock_password"),
@@ -106,7 +107,7 @@ def okta_browser_idp():
 
 
 @pytest.fixture(scope="class")
-def azure_browser_idp():
+def azure_browser_idp() -> typing.Dict[str, typing.Union[str, bool, int]]:
     db_connect = {
         "db_user": conf.get("ci-cluster", "test_user", fallback="mock_test_user"),
         "password": conf.get("azure-browser-idp", "password", fallback="mock_password"),
@@ -123,7 +124,7 @@ def azure_browser_idp():
 
 
 @pytest.fixture(scope="class")
-def jumpcloud_browser_idp():
+def jumpcloud_browser_idp() -> typing.Dict[str, typing.Union[str, bool, int]]:
     db_connect = {
         "db_user": conf.get("ci-cluster", "test_user", fallback="mock_test_user"),
         "password": conf.get("jumpcloud-browser-idp", "password", fallback="mock_password"),
@@ -138,7 +139,7 @@ def jumpcloud_browser_idp():
 
 
 @pytest.fixture(scope="class")
-def ping_browser_idp():
+def ping_browser_idp() -> typing.Dict[str, typing.Union[str, bool, int]]:
     db_connect = {
         "iam": conf.getboolean("ping-one-idp", "iam", fallback="mock_iam"),
         "credentials_provider": conf.get("ping-one-idp", "credentials_provider", fallback="PingCredentialsProvider"),
@@ -152,7 +153,7 @@ def ping_browser_idp():
 
 
 @pytest.fixture(scope="class")
-def azure_idp():
+def azure_idp() -> typing.Dict[str, typing.Union[str, bool, int]]:
     db_connect = {
         "db_user": conf.get("ci-cluster", "test_user", fallback="mock_test_user"),
         "password": conf.get("azure-idp", "password", fallback="mock_password"),
@@ -167,7 +168,7 @@ def azure_idp():
 
 
 @pytest.fixture(scope="class")
-def adfs_idp():
+def adfs_idp() -> typing.Dict[str, typing.Union[str, bool, int]]:
     db_connect = {
         "db_user": conf.get("ci-cluster", "test_user", fallback="mock_test_user"),
         "password": conf.get("adfs-idp", "password", fallback="mock_password"),
@@ -183,7 +184,7 @@ def adfs_idp():
 
 
 @pytest.fixture(scope="class")
-def jwt_google_idp():
+def jwt_google_idp() -> typing.Dict[str, typing.Union[str, bool, int]]:
     db_connect = {
         "db_user": conf.get("ci-cluster", "test_user", fallback="mock_test_user"),
         "iam": conf.getboolean("jwt-google-idp", "iam", fallback="mock_iam"),
@@ -198,7 +199,7 @@ def jwt_google_idp():
 
 
 @pytest.fixture(scope="class")
-def jwt_azure_v2_idp():
+def jwt_azure_v2_idp() -> typing.Dict[str, typing.Union[str, bool, int]]:
     db_connect = {
         "db_user": conf.get("ci-cluster", "test_user", fallback="mock_test_user"),
         "iam": conf.getboolean("jwt-azure-v2-idp", "iam", fallback="mock_iam"),
@@ -213,10 +214,10 @@ def jwt_azure_v2_idp():
 
 
 @pytest.fixture
-def con(request, db_kwargs):
-    conn = redshift_connector.connect(**db_kwargs)
+def con(request, db_kwargs) -> redshift_connector.Connection:
+    conn: redshift_connector.Connection = redshift_connector.connect(**db_kwargs)
 
-    def fin():
+    def fin() -> None:
         conn.rollback()
         try:
             conn.close()
@@ -228,21 +229,21 @@ def fin():
 
 
 @pytest.fixture
-def cursor(request, con):
-    cursor = con.cursor()
+def cursor(request, con) -> redshift_connector.Cursor:
+    cursor: redshift_connector.Cursor = con.cursor()
 
-    def fin():
+    def fin() -> None:
         cursor.close()
 
     request.addfinalizer(fin)
     return cursor
 
 
 @pytest.fixture
-def idp_arg(request):
+def idp_arg(request) -> typing.Dict[str, typing.Union[str, bool, int]]:
     return request.getfixturevalue(request.param)
 
 
 @pytest.fixture
-def is_java():
+def is_java() -> bool:
     return "java" in sys.platform.lower()

test/integration/datatype/test_datatypes.py

@@ -44,7 +44,7 @@ def fin():
 def test_datatype_recv_support(db_kwargs, datatype, client_protocol):
     db_kwargs["client_protocol_version"] = client_protocol
     table_name: str = get_table_name(datatype)
-    exp_results: typing.Tuple[typing.Tuple[str, ...], ...] = test_data[datatype.name]
+    exp_results: typing.Tuple[typing.Tuple[typing.Any, ...], ...] = test_data[datatype.name]
 
     with redshift_connector.connect(**db_kwargs) as con:
         assert con._client_protocol_version == client_protocol

test/integration/datatype/test_system_table_queries.py

@@ -1,7 +1,7 @@
 import typing
 from warnings import warn
 
-import pytest
+import pytest  # type: ignore
 
 import redshift_connector
 from redshift_connector.config import ClientProtocolVersion

test/integration/metadata/test_list_catalog.py

@@ -1,15 +1,16 @@
 import configparser
 import os
 import typing
-from warnings import filterwarnings
 
 import pytest  # type: ignore
-from pytest_mock import mocker
 
 import redshift_connector
 
-conf = configparser.ConfigParser()
-root_path = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
+# from warnings import filterwarnings
+
+
+conf: configparser.ConfigParser = configparser.ConfigParser()
+root_path: str = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
 conf.read(root_path + "/config.ini")
 
 cross_table_name: str = "alldt_test"

test/integration/plugin/conftest.py

@@ -1,7 +1,7 @@
 import typing
 from test.conftest import _get_default_connection_args, conf
 
-import pytest
+import pytest  # type: ignore
 
 import redshift_connector
 

test/integration/plugin/test_azure_credentials_provider.py

@@ -1,15 +1,16 @@
 import configparser
 import os
+import typing
 
 import pytest  # type: ignore
 
 import redshift_connector
 
-conf = configparser.ConfigParser()
-root_path = os.path.dirname(os.path.dirname(os.path.abspath(os.path.join(__file__, os.pardir))))
+conf: configparser.ConfigParser = configparser.ConfigParser()
+root_path: str = os.path.dirname(os.path.dirname(os.path.abspath(os.path.join(__file__, os.pardir))))
 conf.read(root_path + "/config.ini")
 
-PROVIDER = ["azure_idp"]
+PROVIDER: typing.List[str] = ["azure_idp"]
 
 
 @pytest.mark.parametrize("idp_arg", PROVIDER, indirect=True)

test/integration/plugin/test_credentials_providers.py

@@ -3,14 +3,14 @@
 import sys
 import typing
 
-import botocore
+import botocore  # type: ignore
 import pytest  # type: ignore
 
 import redshift_connector
 from redshift_connector import DriverInfo
 
-conf = configparser.ConfigParser()
-root_path = os.path.dirname(os.path.dirname(os.path.abspath(os.path.join(__file__, os.pardir))))
+conf: configparser.ConfigParser = configparser.ConfigParser()
+root_path: str = os.path.dirname(os.path.dirname(os.path.abspath(os.path.join(__file__, os.pardir))))
 conf.read(root_path + "/config.ini")
 
 
@@ -47,8 +47,7 @@ def getAcceptedIssuers(self):
 
 
 @pytest.mark.parametrize("idp_arg", NON_BROWSER_IDP, indirect=True)
-def testIdpPassword(idp_arg):
-    idp_arg = idp_arg
+def test_idp_password(idp_arg):
     idp_arg["password"] = "wrong_password"
 
     with pytest.raises(
@@ -59,7 +58,7 @@ def testIdpPassword(idp_arg):
 
 
 @pytest.mark.parametrize("idp_arg", NON_BROWSER_IDP, indirect=True)
-def testClusterIdentifier(idp_arg):
+def test_cluster_identifier(idp_arg):
     wrong_identifier = "redshift-cluster-11"
     idp_arg["cluster_identifier"] = wrong_identifier
 
@@ -68,7 +67,7 @@ def testClusterIdentifier(idp_arg):
 
 
 @pytest.mark.parametrize("idp_arg", NON_BROWSER_IDP, indirect=True)
-def testRegion(idp_arg):
+def test_region(idp_arg):
     wrong_region = "us-east-22"
     idp_arg["region"] = wrong_region
 
@@ -80,7 +79,7 @@ def testRegion(idp_arg):
 
 
 @pytest.mark.parametrize("idp_arg", NON_BROWSER_IDP, indirect=True)
-def testCredentialsProvider(idp_arg):
+def test_credentials_provider(idp_arg):
     with redshift_connector.connect(**idp_arg):
         pass
 

test/integration/plugin/test_okta_credentials_provider.py

@@ -1,15 +1,16 @@
 import configparser
 import os
+import typing
 
 import pytest  # type: ignore
 
 import redshift_connector
 
-conf = configparser.ConfigParser()
-root_path = os.path.dirname(os.path.dirname(os.path.abspath(os.path.join(__file__, os.pardir))))
+conf: configparser.ConfigParser = configparser.ConfigParser()
+root_path: str = os.path.dirname(os.path.dirname(os.path.abspath(os.path.join(__file__, os.pardir))))
 conf.read(root_path + "/config.ini")
 
-PROVIDER = ["okta_idp"]
+PROVIDER: typing.List[str] = ["okta_idp"]
 
 
 @pytest.mark.parametrize("idp_arg", PROVIDER, indirect=True)