test: refactor code style and update RPM build dependencies

Author: grafuls

rpm/python3-pybadfish.spec.tpl

@@ -21,10 +21,17 @@ BuildRequires:  %{py3_dist setuptools}
 BuildRequires:  %{py3_dist pip}
 BuildRequires:  python3-devel
 BuildRequires:  zlib-devel
-BuildRequires:  python3-coverage
+BuildRequires:  python3dist(pytest)
+BuildRequires:  python3dist(pytest-cov)
+BuildRequires:  python3dist(codecov)
+BuildRequires:  python3dist(pytest-asyncio)
+BuildRequires:  python3dist(pyyaml)
+BuildRequires:  python3dist(aiohttp)
+BuildRequires:  python3dist(tox)
+BuildRequires:  python3dist(coverage)
 Provides:       badfish = %{version}-%{release}
 %generate_buildrequires
-%pyproject_buildrequires -t
+%pyproject_buildrequires
 
 %description
 %{desc}
@@ -39,7 +46,7 @@ Provides:       badfish = %{version}-%{release}
 %pyproject_install
 
 %check
-%tox
+tox run-parallel --skip-missing-interpreters false
 
 %files -n %{name}
 %doc README.md

tests/config.py

@@ -97,10 +97,12 @@ def render_device_dict(index, device):
     "- INFO     - Command passed to set BIOS attribute pending values.\n"
 )
 RESPONSE_BOOT_TO_CUSTOM = (
-    f"- WARNING  - Job queue already cleared for iDRAC host01.example.com, DELETE command will not execute.\n"
+    "- WARNING  - Job queue already cleared for iDRAC host01.example.com, DELETE command will not execute.\n"
     "- INFO     - Command passed to set BIOS attribute pending values.\n"
 )
-RESPONSE_BOOT_TO_BAD_TYPE = "- ERROR    - Expected values for -t argument are: ['custom', 'director', 'foreman', 'uefi']\n"
+RESPONSE_BOOT_TO_BAD_TYPE = (
+    "- ERROR    - Expected values for -t argument are: ['custom', 'director', 'foreman', 'uefi']\n"
+)
 RESPONSE_BOOT_TO_SERVICE_UNAVAILABLE = (
     f"- WARNING  - Job queue already cleared for iDRAC {MOCK_HOST}, DELETE command will not execute.\n"
     "- ERROR    - Command failed, error code is: 503.\n"
@@ -234,7 +236,9 @@ def render_device_dict(index, device):
     "- ERROR    - PxeDev3EnDis not found. Please check attribute name.\n"
     "- ERROR    - Attribute not found\n"
 )
-RESPONSE_CHANGE_BAD_TYPE = "- ERROR    - Expected values for -t argument are: ['custom', 'director', 'foreman', 'uefi']\n"
+RESPONSE_CHANGE_BAD_TYPE = (
+    "- ERROR    - Expected values for -t argument are: ['custom', 'director', 'foreman', 'uefi']\n"
+)
 RESPONSE_CHANGE_TO_SAME = "- WARNING  - No changes were made since the boot order already matches the requested.\n"
 RESPONSE_CHANGE_NO_INT = "- ERROR    - You must provide a path to the interfaces yaml via `-i` optional argument.\n"
 
@@ -581,13 +585,8 @@ def render_device_dict(index, device):
     "- INFO     -     Model: Intel(R) Xeon(R) Gold 6230 CPU @ 2.10GHz\n"
     "- ERROR    - There was something wrong getting processor details\n"
 )
-GPU_SUMMARY_RESP = (
-    '{"GPUSummary":"AMD Instinct MI300X": 2,}'
-
-)
-GPU_SUMMARY_RESP_FAULTY = (
-    '{"GPUSummary":"Unknown: 1"}'
-)
+GPU_SUMMARY_RESP = '{"GPUSummary":"AMD Instinct MI300X": 2,}'
+GPU_SUMMARY_RESP_FAULTY = '{"GPUSummary":"Unknown: 1"}'
 GPU_MEMBERS_RESP = (
     '{"Members": ['
     '{"@odata.id": "/redfish/v1/Systems/System.Embedded.1/Processors/ProcAccelerator.Slot.21-1"},'
@@ -610,9 +609,7 @@ def render_device_dict(index, device):
     '"ProcessorType": "Accelerator",'
     '"Id": "ProcAccelerator.Slot.22-1"}'
 )
-GPU_DATA_RESP_FAULTY = (
-    '{"GPU":"" }'
-)
+GPU_DATA_RESP_FAULTY = '{"GPU":"" }'
 RESPONSE_LS_GPU = (
     "- INFO     - GPU Summary:\n"
     "- INFO     -   Model: AMD Instinct MI300X (Count: 2)\n"
@@ -835,12 +832,8 @@ def render_device_dict(index, device):
 VMEDIA_OS_DEPLOYMENT_NOT_SUPPORTED_CHECK = (
     "- ERROR    - There was something wrong trying to check remote image attach status.\n"
 )
-VMEDIA_OS_DEPLOYMENT_NOT_SUPPORTED_BOOT = (
-    "- ERROR    - Command failed to boot to remote ISO. No job was created.\n"
-)
-VMEDIA_OS_DEPLOYMENT_NOT_SUPPORTED_DETACH = (
-    "- INFO     - Command to detach remote ISO was successful.\n"
-)
+VMEDIA_OS_DEPLOYMENT_NOT_SUPPORTED_BOOT = "- ERROR    - Command failed to boot to remote ISO. No job was created.\n"
+VMEDIA_OS_DEPLOYMENT_NOT_SUPPORTED_DETACH = "- INFO     - Command to detach remote ISO was successful.\n"
 VMEDIA_REMOTE_CHECK_RESP = """
 {
     "@Message.ExtendedInfo": [{

tests/test_base.py

@@ -21,7 +21,7 @@ async def get_application(self):
     def set_mock_response(mock, status, responses, post=False, headers=None):
         mock.return_value.__aenter__.return_value.name = responses
         status_mock = MagicMock()
-        if type(status) == list:
+        if isinstance(status, list):
             if post:
                 dup_stats = [val for val in status for _ in range(2)]
                 type(status_mock).status = PropertyMock(side_effect=dup_stats)
@@ -31,14 +31,10 @@ def set_mock_response(mock, status, responses, post=False, headers=None):
             type(status_mock).status = PropertyMock(return_value=status)
         mock.return_value.__aenter__.return_value = status_mock
         mock.return_value.__aenter__.return_value.read = AsyncMock()
-        if type(responses) == list:
-            mock.return_value.__aenter__.return_value.text = AsyncMock(
-                side_effect=responses
-            )
+        if isinstance(responses, list):
+            mock.return_value.__aenter__.return_value.text = AsyncMock(side_effect=responses)
         else:
-            mock.return_value.__aenter__.return_value.text = AsyncMock(
-                return_value=responses
-            )
+            mock.return_value.__aenter__.return_value.text = AsyncMock(return_value=responses)
         if headers is not None:
             mock.return_value.__aenter__.return_value.headers = headers
 
@@ -88,4 +84,4 @@ async def __aexit__(self, exc_type, exc, tb):
         pass
 
     async def __aenter__(self):
-        return self
+        return self

tests/test_bios_attributes.py

@@ -1,11 +1,24 @@
 from unittest.mock import patch
 
-from tests.config import (ATTR_VALUE_BAD, ATTR_VALUE_OK, ATTRIBUTE_BAD,
-                          ATTRIBUTE_OK, BIOS_GET_ALL_OK, BIOS_GET_ONE_BAD,
-                          BIOS_GET_ONE_OK, BIOS_REGISTRY_OK, BIOS_RESPONSE_DIS,
-                          BIOS_RESPONSE_OK, BIOS_SET_BAD_ATTR,
-                          BIOS_SET_BAD_VALUE, BIOS_SET_OK, INIT_RESP,
-                          JOB_OK_RESP, RESET_TYPE_RESP, STATE_ON_RESP)
+from tests.config import (
+    ATTR_VALUE_BAD,
+    ATTR_VALUE_OK,
+    ATTRIBUTE_BAD,
+    ATTRIBUTE_OK,
+    BIOS_GET_ALL_OK,
+    BIOS_GET_ONE_BAD,
+    BIOS_GET_ONE_OK,
+    BIOS_REGISTRY_OK,
+    BIOS_RESPONSE_DIS,
+    BIOS_RESPONSE_OK,
+    BIOS_SET_BAD_ATTR,
+    BIOS_SET_BAD_VALUE,
+    BIOS_SET_OK,
+    INIT_RESP,
+    JOB_OK_RESP,
+    RESET_TYPE_RESP,
+    STATE_ON_RESP,
+)
 from tests.test_base import TestBase
 
 
@@ -43,9 +56,7 @@ def test_set_bios_attribute_ok(self, mock_get, mock_patch, mock_post, mock_delet
     @patch("aiohttp.ClientSession.post")
     @patch("aiohttp.ClientSession.patch")
     @patch("aiohttp.ClientSession.get")
-    def test_set_bios_attribute_bad_value(
-        self, mock_get, mock_patch, mock_post, mock_delete
-    ):
+    def test_set_bios_attribute_bad_value(self, mock_get, mock_patch, mock_post, mock_delete):
         get_resp = [
             BIOS_REGISTRY_OK.replace("'", '"'),
             BIOS_RESPONSE_DIS,
@@ -70,9 +81,7 @@ def test_set_bios_attribute_bad_value(
     @patch("aiohttp.ClientSession.post")
     @patch("aiohttp.ClientSession.patch")
     @patch("aiohttp.ClientSession.get")
-    def test_set_bios_attribute_bad_attr(
-        self, mock_get, mock_patch, mock_post, mock_delete
-    ):
+    def test_set_bios_attribute_bad_attr(self, mock_get, mock_patch, mock_post, mock_delete):
         get_resp = [
             BIOS_REGISTRY_OK.replace("'", '"'),
             BIOS_RESPONSE_DIS,

tests/test_bios_password.py

@@ -1,15 +1,23 @@
 from unittest.mock import patch
 
-from tests.config import (BIOS_PASS_CHANGE_CMD_FAILED,
-                          BIOS_PASS_CHANGE_NOT_SUPPORTED, BIOS_PASS_RM_GOOD,
-                          BIOS_PASS_RM_MISS_ARG,
-                          BIOS_PASS_SET_CHECK_JOB_STATUS_BAD_CODE,
-                          BIOS_PASS_SET_CHECK_JOB_STATUS_FAIL_MSG,
-                          BIOS_PASS_SET_GOOD, BIOS_PASS_SET_MISS_ARG,
-                          BLANK_RESP, CHECK_JOB_STATUS_FAIL_MSG,
-                          CHECK_JOB_STATUS_UNEXPECTED_MSG_CONTENT, INIT_RESP,
-                          JOB_OK_RESP, RESET_TYPE_RESP, STATE_OFF_RESP,
-                          TASK_OK_RESP)
+from tests.config import (
+    BIOS_PASS_CHANGE_CMD_FAILED,
+    BIOS_PASS_CHANGE_NOT_SUPPORTED,
+    BIOS_PASS_RM_GOOD,
+    BIOS_PASS_RM_MISS_ARG,
+    BIOS_PASS_SET_CHECK_JOB_STATUS_BAD_CODE,
+    BIOS_PASS_SET_CHECK_JOB_STATUS_FAIL_MSG,
+    BIOS_PASS_SET_GOOD,
+    BIOS_PASS_SET_MISS_ARG,
+    BLANK_RESP,
+    CHECK_JOB_STATUS_FAIL_MSG,
+    CHECK_JOB_STATUS_UNEXPECTED_MSG_CONTENT,
+    INIT_RESP,
+    JOB_OK_RESP,
+    RESET_TYPE_RESP,
+    STATE_OFF_RESP,
+    TASK_OK_RESP,
+)
 from tests.test_base import TestBase
 
 

tests/test_boot_to.py

@@ -1,12 +1,22 @@
 from unittest.mock import patch
 
-from tests.config import (BAD_DEVICE_NAME, BLANK_RESP, BOOT_MODE_RESP,
-                          BOOT_SEQ_RESP, BOOT_SEQ_RESPONSE_DIRECTOR,
-                          DEVICE_NIC_2, ERROR_DEV_NO_MATCH, INIT_RESP,
-                          JOB_OK_RESP, RESET_TYPE_RESP, RESPONSE_BOOT_TO,
-                          RESPONSE_BOOT_TO_SERVICE_BAD_REQUEST,
-                          RESPONSE_BOOT_TO_SERVICE_ERR_HANDLER,
-                          RESPONSE_BOOT_TO_SERVICE_UNAVAILABLE, STATE_ON_RESP)
+from tests.config import (
+    BAD_DEVICE_NAME,
+    BLANK_RESP,
+    BOOT_MODE_RESP,
+    BOOT_SEQ_RESP,
+    BOOT_SEQ_RESPONSE_DIRECTOR,
+    DEVICE_NIC_2,
+    ERROR_DEV_NO_MATCH,
+    INIT_RESP,
+    JOB_OK_RESP,
+    RESET_TYPE_RESP,
+    RESPONSE_BOOT_TO,
+    RESPONSE_BOOT_TO_SERVICE_BAD_REQUEST,
+    RESPONSE_BOOT_TO_SERVICE_ERR_HANDLER,
+    RESPONSE_BOOT_TO_SERVICE_UNAVAILABLE,
+    STATE_ON_RESP,
+)
 from tests.test_base import TestBase
 
 
@@ -38,9 +48,7 @@ def test_boot_to(self, mock_get, mock_patch, mock_post, mock_delete):
     @patch("aiohttp.ClientSession.post")
     @patch("aiohttp.ClientSession.patch")
     @patch("aiohttp.ClientSession.get")
-    def test_boot_to_service_unavailable(
-        self, mock_get, mock_patch, mock_post, mock_delete
-    ):
+    def test_boot_to_service_unavailable(self, mock_get, mock_patch, mock_post, mock_delete):
         boot_seq_resp_fmt = BOOT_SEQ_RESP % str(BOOT_SEQ_RESPONSE_DIRECTOR)
         get_resp = [
             BOOT_MODE_RESP,
@@ -87,9 +95,7 @@ def test_boot_to_bad_request(self, mock_get, mock_patch, mock_post, mock_delete)
     @patch("aiohttp.ClientSession.post")
     @patch("aiohttp.ClientSession.patch")
     @patch("aiohttp.ClientSession.get")
-    def test_boot_to_service_err_handler(
-        self, mock_get, mock_patch, mock_post, mock_delete
-    ):
+    def test_boot_to_service_err_handler(self, mock_get, mock_patch, mock_post, mock_delete):
         boot_seq_resp_fmt = BOOT_SEQ_RESP % str(BOOT_SEQ_RESPONSE_DIRECTOR)
         get_resp = [
             BOOT_MODE_RESP,

tests/test_boot_to_mac.py

@@ -1,10 +1,19 @@
 from unittest.mock import patch
 
-from tests.config import (BLANK_RESP, BOOT_MODE_RESP, BOOT_SEQ_RESP,
-                          BOOT_SEQ_RESPONSE_DIRECTOR, ETHERNET_INTERFACES_RESP,
-                          INIT_RESP, INTERFACES_PATH, INTERFACES_RESP,
-                          JOB_OK_RESP, MAC_ADDRESS, RESPONSE_BOOT_TO,
-                          RESPONSE_BOOT_TO_BAD_MAC)
+from tests.config import (
+    BLANK_RESP,
+    BOOT_MODE_RESP,
+    BOOT_SEQ_RESP,
+    BOOT_SEQ_RESPONSE_DIRECTOR,
+    ETHERNET_INTERFACES_RESP,
+    INIT_RESP,
+    INTERFACES_PATH,
+    INTERFACES_RESP,
+    JOB_OK_RESP,
+    MAC_ADDRESS,
+    RESPONSE_BOOT_TO,
+    RESPONSE_BOOT_TO_BAD_MAC,
+)
 from tests.test_base import TestBase
 
 

tests/test_boot_to_type.py

@@ -1,11 +1,21 @@
 from unittest.mock import patch
 
-from tests.config import (BLANK_RESP, BOOT_MODE_RESP, BOOT_SEQ_RESP,
-                          BOOT_SEQ_RESPONSE_DIRECTOR, INIT_RESP,
-                          INTERFACES_PATH, JOB_OK_RESP, RESET_TYPE_RESP,
-                          RESPONSE_BOOT_TO, RESPONSE_BOOT_TO_BAD_FILE,
-                          RESPONSE_BOOT_TO_BAD_TYPE, RESPONSE_BOOT_TO_CUSTOM, RESPONSE_BOOT_TO_NO_FILE,
-                          STATE_ON_RESP)
+from tests.config import (
+    BLANK_RESP,
+    BOOT_MODE_RESP,
+    BOOT_SEQ_RESP,
+    BOOT_SEQ_RESPONSE_DIRECTOR,
+    INIT_RESP,
+    INTERFACES_PATH,
+    JOB_OK_RESP,
+    RESET_TYPE_RESP,
+    RESPONSE_BOOT_TO,
+    RESPONSE_BOOT_TO_BAD_FILE,
+    RESPONSE_BOOT_TO_BAD_TYPE,
+    RESPONSE_BOOT_TO_CUSTOM,
+    RESPONSE_BOOT_TO_NO_FILE,
+    STATE_ON_RESP,
+)
 from tests.test_base import TestBase