CI: fixes for copr build, added local test to makefile

Author: grafuls

rpm/Makefile

@@ -36,3 +36,15 @@ srpm: all
 
 clean:
 	rm -rf *.src.rpm *.tar.gz *.spec noarch
+
+test: tarball python3-badfish.spec
+	@echo "Moving tarball to rpmbuild/SOURCES directory"
+	mkdir -p ~/rpmbuild/SOURCES
+	cp $(TARBALL) ~/rpmbuild/SOURCES/
+	@echo "Tarball $(TARBALL) successfully moved to rpmbuild/SOURCES"
+	@echo "Building source RPM from spec file"
+	SRPM_PATH=$$(rpmbuild -bs python3-badfish.spec | grep "Wrote:" | cut -d' ' -f2) && \
+	echo "Source RPM build completed: $$SRPM_PATH" && \
+	echo "Running mock build with the generated SRPM" && \
+	mock -r fedora-rawhide-x86_64 -n $$SRPM_PATH && \
+	echo "Mock build completed successfully"

rpm/python3-badfish.spec.tpl

@@ -21,6 +21,8 @@ BuildRequires:  %{py3_dist setuptools}
 BuildRequires:  %{py3_dist pip}
 BuildRequires:  python3-devel
 BuildRequires:  zlib-devel
+%generate_buildrequires
+%pyproject_buildrequires -t 
 
 %description
 %{desc}
@@ -35,6 +37,9 @@ BuildRequires:  zlib-devel
 %install
 %py3_install
 
+%check
+%tox
+
 %files -n %{name}
 %doc README.md
 %license LICENSE
@@ -45,6 +50,3 @@ BuildRequires:  zlib-devel
 %changelog
 * @DATE@ Gonzalo Rafuls <gonza@redhat.com> - @VERSION@-@RELEASE@
 - built from upstream, changelog ignored
-
-%check
-%{__python3} -m pytest tests/

setup.cfg

@@ -12,7 +12,6 @@ url = https://github.com/redhat-performance/badfish
 classifiers =
     Development Status :: 5 - Production/Stable
     Programming Language :: Python :: 3
-    License :: OSI Approved :: GNU General Public License v3 (GPLv3)
     Operating System :: OS Independent
     Programming Language :: Python :: 3
     Programming Language :: Python :: 3.7
@@ -42,9 +41,6 @@ where = src
 [sdist]
 formats = gztar
 
-[bdist_wheel]
-universal = true
-
 [options.entry_points]
 console_scripts =
     badfish = badfish.main:main

tests/test-requirements.txt

@@ -3,10 +3,10 @@
 ##    pip install --requirement=test-requirements.txt
 ##
 
-pytest==6.2.5
-pytest-cov==3.0.0
-codecov==2.1.13
-asynctest==0.13.0
+pytest>=6.2.5
+pytest-cov>=3.0.0
+codecov>=2.1.12
+pytest-asyncio>=0.23
 pyyaml>=3.10
 aiohttp>=3.7.4
 tox>=4.8.0

tests/test_base.py

@@ -1,12 +1,11 @@
 import sys
+from unittest.mock import AsyncMock, MagicMock, PropertyMock, patch
 
 import pytest
-from asynctest import CoroutineMock, PropertyMock, MagicMock
 from aiohttp import web
 from aiohttp.test_utils import AioHTTPTestCase
-from asynctest import patch
 
-from src.badfish.main import main, BadfishException
+from src.badfish.main import BadfishException, main
 from tests import config
 
 
@@ -30,13 +29,13 @@ def set_mock_response(mock, status, responses, post=False, headers=None):
             mock.return_value.__aenter__.return_value = status_mock
         else:
             mock.return_value.__aenter__.return_value.status = status
-        mock.return_value.__aenter__.return_value.read = CoroutineMock()
+        mock.return_value.__aenter__.return_value.read = AsyncMock()
         if type(responses) == list:
-            mock.return_value.__aenter__.return_value.text = CoroutineMock(
+            mock.return_value.__aenter__.return_value.text = AsyncMock(
                 side_effect=responses
             )
         else:
-            mock.return_value.__aenter__.return_value.text = CoroutineMock(
+            mock.return_value.__aenter__.return_value.text = AsyncMock(
                 return_value=responses
             )
         if headers is not None:
@@ -88,4 +87,4 @@ async def __aexit__(self, exc_type, exc, tb):
         pass
 
     async def __aenter__(self):
-        return self
+        return self

tests/test_bios_attributes.py

@@ -1,23 +1,11 @@
-from asynctest import patch
-from tests.config import (
-    INIT_RESP,
-    STATE_ON_RESP,
-    JOB_OK_RESP,
-    RESET_TYPE_RESP,
-    ATTRIBUTE_OK,
-    ATTRIBUTE_BAD,
-    ATTR_VALUE_OK,
-    ATTR_VALUE_BAD,
-    BIOS_REGISTRY_OK,
-    BIOS_RESPONSE_DIS,
-    BIOS_SET_OK,
-    BIOS_RESPONSE_OK,
-    BIOS_GET_ALL_OK,
-    BIOS_GET_ONE_OK,
-    BIOS_GET_ONE_BAD,
-    BIOS_SET_BAD_VALUE,
-    BIOS_SET_BAD_ATTR,
-)
+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.test_base import TestBase
 
 

tests/test_bios_password.py

@@ -1,22 +1,15 @@
-from asynctest import patch
-from tests.config import (
-    INIT_RESP,
-    BLANK_RESP,
-    JOB_OK_RESP,
-    TASK_OK_RESP,
-    RESET_TYPE_RESP,
-    BIOS_PASS_SET_GOOD,
-    BIOS_PASS_RM_GOOD,
-    BIOS_PASS_RM_MISS_ARG,
-    BIOS_PASS_SET_MISS_ARG,
-    STATE_OFF_RESP,
-    BIOS_PASS_CHANGE_NOT_SUPPORTED,
-    BIOS_PASS_CHANGE_CMD_FAILED,
-    BIOS_PASS_SET_CHECK_JOB_STATUS_BAD_CODE,
-    CHECK_JOB_STATUS_FAIL_MSG,
-    CHECK_JOB_STATUS_UNEXPECTED_MSG_CONTENT,
-    BIOS_PASS_SET_CHECK_JOB_STATUS_FAIL_MSG,
-)
+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.test_base import TestBase
 
 

tests/test_boot_to.py

@@ -1,21 +1,12 @@
-from asynctest import patch
-from tests.config import (
-    BOOT_SEQ_RESPONSE_DIRECTOR,
-    DEVICE_NIC_2,
-    RESPONSE_BOOT_TO,
-    BAD_DEVICE_NAME,
-    ERROR_DEV_NO_MATCH,
-    BOOT_SEQ_RESP,
-    BOOT_MODE_RESP,
-    INIT_RESP,
-    BLANK_RESP,
-    JOB_OK_RESP,
-    RESPONSE_BOOT_TO_SERVICE_UNAVAILABLE,
-    RESET_TYPE_RESP,
-    RESPONSE_BOOT_TO_SERVICE_BAD_REQUEST,
-    STATE_ON_RESP,
-    RESPONSE_BOOT_TO_SERVICE_ERR_HANDLER,
-)
+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.test_base import TestBase
 
 

tests/test_boot_to_mac.py

@@ -1,18 +1,10 @@
-from asynctest import patch
-from tests.config import (
-    BOOT_SEQ_RESPONSE_DIRECTOR,
-    RESPONSE_BOOT_TO,
-    BOOT_SEQ_RESP,
-    BOOT_MODE_RESP,
-    INIT_RESP,
-    BLANK_RESP,
-    JOB_OK_RESP,
-    INTERFACES_PATH,
-    ETHERNET_INTERFACES_RESP,
-    INTERFACES_RESP,
-    MAC_ADDRESS,
-    RESPONSE_BOOT_TO_BAD_MAC,
-)
+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.test_base import TestBase
 
 

tests/test_boot_to_type.py

@@ -1,19 +1,11 @@
-from asynctest import patch
-from tests.config import (
-    BOOT_SEQ_RESPONSE_DIRECTOR,
-    RESPONSE_BOOT_TO,
-    BOOT_SEQ_RESP,
-    BOOT_MODE_RESP,
-    INIT_RESP,
-    BLANK_RESP,
-    JOB_OK_RESP,
-    INTERFACES_PATH,
-    RESET_TYPE_RESP,
-    STATE_ON_RESP,
-    RESPONSE_BOOT_TO_BAD_TYPE,
-    RESPONSE_BOOT_TO_BAD_FILE,
-    RESPONSE_BOOT_TO_NO_FILE,
-)
+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_NO_FILE,
+                          STATE_ON_RESP)
 from tests.test_base import TestBase