PR#8: Replace python-mock usage with unittest.mock - rpms/fedscm-admin

rpms / fedscm-admin

#8 Replace python-mock usage with unittest.mock

Opened 3 months ago by salimma. Modified 3 months ago

rpms/ salimma/fedscm-admin rm-python-mock into rawhide

Replace python-mock usage with unittest.mock

Michel Lind • 3 months ago

297f24d

fedscm-admin.spec

file modified

+6 -2

		`@@ -2,11 +2,12 @@`

		`Name: fedscm-admin`
		`Version: 1.1.7`
		`- Release: 7%{?dist}`
		`+ Release: 8%{?dist}`
		`Summary: CLI tool to process Fedora SCM requests`
		`License: GPL-2.0-or-later`
		`URL: https://pagure.io/fedscm-admin`
		`Source0: https://releases.pagure.org/fedscm-admin/fedscm_admin-%{version}.tar.gz`
		`+ Patch0: https://pagure.io/fedscm-admin/pull-request/84.patch#/fedscm_admin-rm-python-mock.diff`
		`BuildArch: noarch`

		`BuildRequires: help2man`
		`@@ -29,7 +30,7 @@`
		`CLI tool to process Fedora SCM requests.`

		`%prep`
		`- %autosetup -n %{distname}-%{version}`
		`+ %autosetup -n %{distname}-%{version} -p1`
		`rm -vr *.egg-info`

		`%build`
		`@@ -71,6 +72,9 @@`
		`%{_mandir}/man1/fedscm-admin.1*`

		`%changelog`
		`+ * Wed Feb 14 2024 Michel Lind <salimma@fedoraproject.org> - 1.1.7-8`
		`+ - Replace python-mock usage with unittest.mock`
		`+`
		`* Wed Jan 24 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.7-7`
		`- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild`

fedscm_admin-rm-python-mock.diff

file added

+63

		`@@ -0,0 +1,63 @@`
		`+ From ca58fd86d43aa9108e50884efcda1943b7d3c478 Mon Sep 17 00:00:00 2001`
		`+ From: Michel Lind <salimma@fedoraproject.org>`
		`+ Date: Feb 14 2024 22:55:00 +0000`
		`+ Subject: Replace python-mock with unittest.mock`
		`+`
		`+`
		`+ Signed-off-by: Michel Lind <salimma@fedoraproject.org>`
		`+`
		`+ ---`
		`+`
		`+ diff --git a/tests/mock_values.py b/tests/mock_values.py`
		`+ index 480cb2a..ec69daa 100644`
		`+ --- a/tests/mock_values.py`
		`+ +++ b/tests/mock_values.py`
		`+ @@ -17,7 +17,7 @@ Helper classes/functions for the unit tests`
		`+ """`
		`+ import json`
		`+`
		`+ -from mock import Mock`
		`+ +from unittest.mock import Mock`
		`+`
		`+`
		`+ class MockBugzilla(object):`
		`+ diff --git a/tests/test_admin.py b/tests/test_admin.py`
		`+ index cecbe3b..6e62b64 100644`
		`+ --- a/tests/test_admin.py`
		`+ +++ b/tests/test_admin.py`
		`+ @@ -19,7 +19,7 @@ from __future__ import absolute_import`
		`+ from unittest import TestCase`
		`+`
		`+ from click.testing import CliRunner`
		`+ -from mock import patch, MagicMock, Mock`
		`+ +from unittest.mock import patch, MagicMock, Mock`
		`+`
		`+ import tests.mock_values as mock_values`
		`+`
		`+ diff --git a/tests/test_general.py b/tests/test_general.py`
		`+ index e452cee..56c7cca 100644`
		`+ --- a/tests/test_general.py`
		`+ +++ b/tests/test_general.py`
		`+ @@ -22,8 +22,8 @@ import os`
		`+ from unittest import TestCase`
		`+`
		`+ from click import ClickException`
		`+ -from mock import patch, Mock`
		`+ from requests import ConnectionError`
		`+ +from unittest.mock import patch, Mock`
		`+`
		`+ import tests.mock_values as mock_values`
		`+`
		`+ diff --git a/tox.ini b/tox.ini`
		`+ index 2a6ec87..66e29c0 100644`
		`+ --- a/tox.ini`
		`+ +++ b/tox.ini`
		`+ @@ -19,7 +19,6 @@ setenv =`
		`+ LANG = en_US.UTF-8`
		`+ FEDSCM_ADMIN_TEST_CONFIG = true`
		`+ deps =`
		`+ - mock`
		`+ pytest`
		`+ pytest-cov`
		`+ fasjson-client`
		`+`