diff --git a/python-python-jenkins-no-mock.patch b/python-python-jenkins-no-mock.patch new file mode 100644 index 0000000..d70ffda --- /dev/null +++ b/python-python-jenkins-no-mock.patch @@ -0,0 +1,343 @@ +diff -upr python-jenkins-1.7.0.orig/tests/base.py python-jenkins-1.7.0/tests/base.py +--- python-jenkins-1.7.0.orig/tests/base.py 2022-05-03 14:48:58.234141501 +0200 ++++ python-jenkins-1.7.0/tests/base.py 2022-05-03 14:48:58.242141551 +0200 +@@ -1,6 +1,6 @@ + import sys + +-import mock ++from unittest import mock + from testscenarios import TestWithScenarios + + import jenkins +diff -upr python-jenkins-1.7.0.orig/tests/helper.py python-jenkins-1.7.0/tests/helper.py +--- python-jenkins-1.7.0.orig/tests/helper.py 2022-05-03 14:48:58.234141501 +0200 ++++ python-jenkins-1.7.0/tests/helper.py 2022-05-03 14:48:58.242141551 +0200 +@@ -4,7 +4,7 @@ from multiprocessing import Process + from multiprocessing import Queue + import traceback + +-from mock import Mock ++from unittest.mock import Mock + import requests + from six.moves import socketserver + +diff -upr python-jenkins-1.7.0.orig/tests/jobs/test_assert.py python-jenkins-1.7.0/tests/jobs/test_assert.py +--- python-jenkins-1.7.0.orig/tests/jobs/test_assert.py 2022-05-03 14:48:58.238141526 +0200 ++++ python-jenkins-1.7.0/tests/jobs/test_assert.py 2022-05-03 14:48:58.246141576 +0200 +@@ -1,5 +1,5 @@ + import json +-from mock import patch ++from unittest.mock import patch + + import jenkins + from tests.jobs.base import JenkinsJobsTestBase +diff -upr python-jenkins-1.7.0.orig/tests/jobs/test_build.py python-jenkins-1.7.0/tests/jobs/test_build.py +--- python-jenkins-1.7.0.orig/tests/jobs/test_build.py 2022-05-03 14:48:58.238141526 +0200 ++++ python-jenkins-1.7.0/tests/jobs/test_build.py 2022-05-03 14:48:58.246141576 +0200 +@@ -1,5 +1,5 @@ + # -*- coding: utf-8 -*- +-from mock import patch ++from unittest.mock import patch + + import jenkins + from six.moves.urllib.parse import quote +diff -upr python-jenkins-1.7.0.orig/tests/jobs/test_config.py python-jenkins-1.7.0/tests/jobs/test_config.py +--- python-jenkins-1.7.0.orig/tests/jobs/test_config.py 2022-05-03 14:48:58.238141526 +0200 ++++ python-jenkins-1.7.0/tests/jobs/test_config.py 2022-05-03 14:48:58.246141576 +0200 +@@ -1,4 +1,4 @@ +-from mock import patch ++from unittest.mock import patch + + import jenkins + from tests.jobs.base import JenkinsJobsTestBase +diff -upr python-jenkins-1.7.0.orig/tests/jobs/test_copy.py python-jenkins-1.7.0/tests/jobs/test_copy.py +--- python-jenkins-1.7.0.orig/tests/jobs/test_copy.py 2022-05-03 14:48:58.238141526 +0200 ++++ python-jenkins-1.7.0/tests/jobs/test_copy.py 2022-05-03 14:48:58.246141576 +0200 +@@ -1,5 +1,5 @@ + import json +-from mock import patch ++from unittest.mock import patch + + import jenkins + from tests.jobs.base import JenkinsJobsTestBase +diff -upr python-jenkins-1.7.0.orig/tests/jobs/test_count.py python-jenkins-1.7.0/tests/jobs/test_count.py +--- python-jenkins-1.7.0.orig/tests/jobs/test_count.py 2022-05-03 14:48:58.238141526 +0200 ++++ python-jenkins-1.7.0/tests/jobs/test_count.py 2022-05-03 14:48:58.246141576 +0200 +@@ -1,5 +1,5 @@ + import json +-from mock import patch ++from unittest.mock import patch + + import jenkins + from tests.jobs.base import JenkinsJobsTestBase +diff -upr python-jenkins-1.7.0.orig/tests/jobs/test_create.py python-jenkins-1.7.0/tests/jobs/test_create.py +--- python-jenkins-1.7.0.orig/tests/jobs/test_create.py 2022-05-03 14:48:58.238141526 +0200 ++++ python-jenkins-1.7.0/tests/jobs/test_create.py 2022-05-03 14:48:58.246141576 +0200 +@@ -1,5 +1,5 @@ + import json +-from mock import patch ++from unittest.mock import patch + + import jenkins + from tests.jobs.base import JenkinsJobsTestBase +diff -upr python-jenkins-1.7.0.orig/tests/jobs/test_debug.py python-jenkins-1.7.0/tests/jobs/test_debug.py +--- python-jenkins-1.7.0.orig/tests/jobs/test_debug.py 2022-05-03 14:48:58.238141526 +0200 ++++ python-jenkins-1.7.0/tests/jobs/test_debug.py 2022-05-03 14:48:58.246141576 +0200 +@@ -1,5 +1,5 @@ + import json +-from mock import patch ++from unittest.mock import patch + + import jenkins + from tests.jobs.base import JenkinsJobsTestBase +diff -upr python-jenkins-1.7.0.orig/tests/jobs/test_delete.py python-jenkins-1.7.0/tests/jobs/test_delete.py +--- python-jenkins-1.7.0.orig/tests/jobs/test_delete.py 2022-05-03 14:48:58.238141526 +0200 ++++ python-jenkins-1.7.0/tests/jobs/test_delete.py 2022-05-03 14:48:58.246141576 +0200 +@@ -1,5 +1,5 @@ + import json +-from mock import patch ++from unittest.mock import patch + + import jenkins + from tests.jobs.base import JenkinsJobsTestBase +diff -upr python-jenkins-1.7.0.orig/tests/jobs/test_disable.py python-jenkins-1.7.0/tests/jobs/test_disable.py +--- python-jenkins-1.7.0.orig/tests/jobs/test_disable.py 2022-05-03 14:48:58.238141526 +0200 ++++ python-jenkins-1.7.0/tests/jobs/test_disable.py 2022-05-03 14:48:58.246141576 +0200 +@@ -1,5 +1,5 @@ + import json +-from mock import patch ++from unittest.mock import patch + + import jenkins + from tests.jobs.base import JenkinsJobsTestBase +diff -upr python-jenkins-1.7.0.orig/tests/jobs/test_enable.py python-jenkins-1.7.0/tests/jobs/test_enable.py +--- python-jenkins-1.7.0.orig/tests/jobs/test_enable.py 2022-05-03 14:48:58.238141526 +0200 ++++ python-jenkins-1.7.0/tests/jobs/test_enable.py 2022-05-03 14:48:58.246141576 +0200 +@@ -1,5 +1,5 @@ + import json +-from mock import patch ++from unittest.mock import patch + + import jenkins + from tests.jobs.base import JenkinsJobsTestBase +diff -upr python-jenkins-1.7.0.orig/tests/jobs/test_getall.py python-jenkins-1.7.0/tests/jobs/test_getall.py +--- python-jenkins-1.7.0.orig/tests/jobs/test_getall.py 2022-05-03 14:48:58.238141526 +0200 ++++ python-jenkins-1.7.0/tests/jobs/test_getall.py 2022-05-03 14:48:58.246141576 +0200 +@@ -1,5 +1,5 @@ + import json +-from mock import patch ++from unittest.mock import patch + + import jenkins + from tests.jobs.base import JenkinsGetJobsTestBase +diff -upr python-jenkins-1.7.0.orig/tests/jobs/test_get.py python-jenkins-1.7.0/tests/jobs/test_get.py +--- python-jenkins-1.7.0.orig/tests/jobs/test_get.py 2022-05-03 14:48:58.238141526 +0200 ++++ python-jenkins-1.7.0/tests/jobs/test_get.py 2022-05-03 14:48:58.246141576 +0200 +@@ -1,5 +1,5 @@ + import json +-from mock import patch ++from unittest.mock import patch + + import jenkins + from tests.helper import build_response_mock +diff -upr python-jenkins-1.7.0.orig/tests/jobs/test_info.py python-jenkins-1.7.0/tests/jobs/test_info.py +--- python-jenkins-1.7.0.orig/tests/jobs/test_info.py 2022-05-03 14:48:58.238141526 +0200 ++++ python-jenkins-1.7.0/tests/jobs/test_info.py 2022-05-03 14:48:58.246141576 +0200 +@@ -1,5 +1,5 @@ + import json +-from mock import patch ++from unittest.mock import patch + + import jenkins + from tests.helper import build_response_mock +diff -upr python-jenkins-1.7.0.orig/tests/jobs/test_name.py python-jenkins-1.7.0/tests/jobs/test_name.py +--- python-jenkins-1.7.0.orig/tests/jobs/test_name.py 2022-05-03 14:48:58.238141526 +0200 ++++ python-jenkins-1.7.0/tests/jobs/test_name.py 2022-05-03 14:48:58.246141576 +0200 +@@ -1,5 +1,5 @@ + import json +-from mock import patch ++from unittest.mock import patch + + import jenkins + from tests.jobs.base import JenkinsJobsTestBase +diff -upr python-jenkins-1.7.0.orig/tests/jobs/test_reconfig.py python-jenkins-1.7.0/tests/jobs/test_reconfig.py +--- python-jenkins-1.7.0.orig/tests/jobs/test_reconfig.py 2022-05-03 14:48:58.238141526 +0200 ++++ python-jenkins-1.7.0/tests/jobs/test_reconfig.py 2022-05-03 14:48:58.246141576 +0200 +@@ -1,5 +1,5 @@ + import json +-from mock import patch ++from unittest.mock import patch + + import jenkins + from tests.jobs.base import JenkinsJobsTestBase +diff -upr python-jenkins-1.7.0.orig/tests/jobs/test_rename.py python-jenkins-1.7.0/tests/jobs/test_rename.py +--- python-jenkins-1.7.0.orig/tests/jobs/test_rename.py 2022-05-03 14:48:58.238141526 +0200 ++++ python-jenkins-1.7.0/tests/jobs/test_rename.py 2022-05-03 14:48:58.246141576 +0200 +@@ -1,5 +1,5 @@ + import json +-from mock import patch ++from unittest.mock import patch + + import jenkins + from tests.jobs.base import JenkinsJobsTestBase +diff -upr python-jenkins-1.7.0.orig/tests/jobs/test_set_next_build_number.py python-jenkins-1.7.0/tests/jobs/test_set_next_build_number.py +--- python-jenkins-1.7.0.orig/tests/jobs/test_set_next_build_number.py 2022-05-03 14:48:58.238141526 +0200 ++++ python-jenkins-1.7.0/tests/jobs/test_set_next_build_number.py 2022-05-03 14:48:58.246141576 +0200 +@@ -1,4 +1,4 @@ +-from mock import patch ++from unittest.mock import patch + + import jenkins + from tests.jobs.base import JenkinsJobsTestBase +diff -upr python-jenkins-1.7.0.orig/tests/test_build.py python-jenkins-1.7.0/tests/test_build.py +--- python-jenkins-1.7.0.orig/tests/test_build.py 2022-05-03 14:48:58.234141501 +0200 ++++ python-jenkins-1.7.0/tests/test_build.py 2022-05-03 14:48:58.242141551 +0200 +@@ -1,7 +1,7 @@ + import json + + import collections +-from mock import patch ++from unittest.mock import patch + + import jenkins + from tests.base import JenkinsTestBase +diff -upr python-jenkins-1.7.0.orig/tests/test_check_jenkinsfile_syntax.py python-jenkins-1.7.0/tests/test_check_jenkinsfile_syntax.py +--- python-jenkins-1.7.0.orig/tests/test_check_jenkinsfile_syntax.py 2022-05-03 14:48:58.234141501 +0200 ++++ python-jenkins-1.7.0/tests/test_check_jenkinsfile_syntax.py 2022-05-03 14:48:58.246141576 +0200 +@@ -1,4 +1,4 @@ +-from mock import patch ++from unittest.mock import patch + + from tests.base import JenkinsTestBase + from tests.helper import build_response_mock +diff -upr python-jenkins-1.7.0.orig/tests/test_credential.py python-jenkins-1.7.0/tests/test_credential.py +--- python-jenkins-1.7.0.orig/tests/test_credential.py 2022-05-03 14:48:58.234141501 +0200 ++++ python-jenkins-1.7.0/tests/test_credential.py 2022-05-03 14:48:58.242141551 +0200 +@@ -1,5 +1,5 @@ + import json +-from mock import patch ++from unittest.mock import patch + + import jenkins + from tests.base import JenkinsTestBase +diff -upr python-jenkins-1.7.0.orig/tests/test_info.py python-jenkins-1.7.0/tests/test_info.py +--- python-jenkins-1.7.0.orig/tests/test_info.py 2022-05-03 14:48:58.238141526 +0200 ++++ python-jenkins-1.7.0/tests/test_info.py 2022-05-03 14:48:58.246141576 +0200 +@@ -1,5 +1,5 @@ + import json +-from mock import patch ++from unittest.mock import patch + + import jenkins + from tests.base import JenkinsTestBase +diff -upr python-jenkins-1.7.0.orig/tests/test_jenkins.py python-jenkins-1.7.0/tests/test_jenkins.py +--- python-jenkins-1.7.0.orig/tests/test_jenkins.py 2022-05-03 14:48:58.234141501 +0200 ++++ python-jenkins-1.7.0/tests/test_jenkins.py 2022-05-03 14:48:58.246141576 +0200 +@@ -1,7 +1,7 @@ + import json + import socket + +-from mock import patch ++from unittest.mock import patch + import six + + from tests.base import JenkinsTestBase +diff -upr python-jenkins-1.7.0.orig/tests/test_job_folder.py python-jenkins-1.7.0/tests/test_job_folder.py +--- python-jenkins-1.7.0.orig/tests/test_job_folder.py 2022-05-03 14:48:58.234141501 +0200 ++++ python-jenkins-1.7.0/tests/test_job_folder.py 2022-05-03 14:48:58.242141551 +0200 +@@ -1,4 +1,4 @@ +-from mock import patch ++from unittest.mock import patch + + import jenkins + from tests.base import JenkinsTestBase +diff -upr python-jenkins-1.7.0.orig/tests/test_node.py python-jenkins-1.7.0/tests/test_node.py +--- python-jenkins-1.7.0.orig/tests/test_node.py 2022-05-03 14:48:58.234141501 +0200 ++++ python-jenkins-1.7.0/tests/test_node.py 2022-05-03 14:48:58.242141551 +0200 +@@ -1,5 +1,5 @@ + import json +-from mock import patch ++from unittest.mock import patch + + import jenkins + import requests_mock +diff -upr python-jenkins-1.7.0.orig/tests/test_plugins.py python-jenkins-1.7.0/tests/test_plugins.py +--- python-jenkins-1.7.0.orig/tests/test_plugins.py 2022-05-03 14:48:58.234141501 +0200 ++++ python-jenkins-1.7.0/tests/test_plugins.py 2022-05-03 14:48:58.242141551 +0200 +@@ -32,7 +32,7 @@ + + + import json +-from mock import patch ++from unittest.mock import patch + from testscenarios.scenarios import multiply_scenarios + + import jenkins +diff -upr python-jenkins-1.7.0.orig/tests/test_promotion.py python-jenkins-1.7.0/tests/test_promotion.py +--- python-jenkins-1.7.0.orig/tests/test_promotion.py 2022-05-03 14:48:58.234141501 +0200 ++++ python-jenkins-1.7.0/tests/test_promotion.py 2022-05-03 14:48:58.242141551 +0200 +@@ -1,5 +1,5 @@ + import json +-from mock import patch ++from unittest.mock import patch + + import jenkins + from tests.base import JenkinsTestBase +diff -upr python-jenkins-1.7.0.orig/tests/test_queue.py python-jenkins-1.7.0/tests/test_queue.py +--- python-jenkins-1.7.0.orig/tests/test_queue.py 2022-05-03 14:48:58.234141501 +0200 ++++ python-jenkins-1.7.0/tests/test_queue.py 2022-05-03 14:48:58.246141576 +0200 +@@ -1,5 +1,5 @@ + import json +-from mock import patch ++from unittest.mock import patch + + import jenkins + from tests.base import JenkinsTestBase +diff -upr python-jenkins-1.7.0.orig/tests/test_quiet_down.py python-jenkins-1.7.0/tests/test_quiet_down.py +--- python-jenkins-1.7.0.orig/tests/test_quiet_down.py 2022-05-03 14:48:58.238141526 +0200 ++++ python-jenkins-1.7.0/tests/test_quiet_down.py 2022-05-03 14:48:58.246141576 +0200 +@@ -1,5 +1,5 @@ + import json +-from mock import patch ++from unittest.mock import patch + + import jenkins + from tests.base import JenkinsTestBase +diff -upr python-jenkins-1.7.0.orig/tests/test_script.py python-jenkins-1.7.0/tests/test_script.py +--- python-jenkins-1.7.0.orig/tests/test_script.py 2022-05-03 14:48:58.234141501 +0200 ++++ python-jenkins-1.7.0/tests/test_script.py 2022-05-03 14:48:58.242141551 +0200 +@@ -1,4 +1,4 @@ +-from mock import patch ++from unittest.mock import patch + + import jenkins + from tests.base import JenkinsTestBase +diff -upr python-jenkins-1.7.0.orig/tests/test_version.py python-jenkins-1.7.0/tests/test_version.py +--- python-jenkins-1.7.0.orig/tests/test_version.py 2022-05-03 14:48:58.234141501 +0200 ++++ python-jenkins-1.7.0/tests/test_version.py 2022-05-03 14:48:58.246141576 +0200 +@@ -1,4 +1,4 @@ +-from mock import patch ++from unittest.mock import patch + + import jenkins + from tests.base import JenkinsTestBase +diff -upr python-jenkins-1.7.0.orig/tests/test_view.py python-jenkins-1.7.0/tests/test_view.py +--- python-jenkins-1.7.0.orig/tests/test_view.py 2022-05-03 14:48:58.238141526 +0200 ++++ python-jenkins-1.7.0/tests/test_view.py 2022-05-03 14:48:58.246141576 +0200 +@@ -1,5 +1,5 @@ + import json +-from mock import patch ++from unittest.mock import patch + + import jenkins + from tests.base import JenkinsTestBase +diff -upr python-jenkins-1.7.0.orig/tests/test_whoami.py python-jenkins-1.7.0/tests/test_whoami.py +--- python-jenkins-1.7.0.orig/tests/test_whoami.py 2022-05-03 14:48:58.234141501 +0200 ++++ python-jenkins-1.7.0/tests/test_whoami.py 2022-05-03 14:48:58.242141551 +0200 +@@ -1,5 +1,5 @@ + import json +-from mock import patch ++from unittest.mock import patch + + import jenkins + from tests.base import JenkinsTestBase diff --git a/python-python-jenkins.changes b/python-python-jenkins.changes index 4d30d2a..368d235 100644 --- a/python-python-jenkins.changes +++ b/python-python-jenkins.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Wed May 4 05:46:39 UTC 2022 - pgajdos@suse.com + +- added patches + fix https://bugs.launchpad.net/python-jenkins/+bug/1971524 + + python-python-jenkins-no-mock.patch + ------------------------------------------------------------------- Mon Mar 15 15:45:33 UTC 2021 - Markéta Machová diff --git a/python-python-jenkins.spec b/python-python-jenkins.spec index c41067f..a82d457 100644 --- a/python-python-jenkins.spec +++ b/python-python-jenkins.spec @@ -1,7 +1,7 @@ # # spec file for package python-python-jenkins # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2022 SUSE LLC # Copyright (c) 2014 Thomas Bechtold # # All modifications and additions to the file contributed by third parties @@ -26,8 +26,9 @@ License: BSD-3-Clause Group: Development/Languages/Python URL: https://opendev.org/jjb/python-jenkins Source: https://files.pythonhosted.org/packages/source/p/python-jenkins/python-jenkins-%{version}.tar.gz +# https://bugs.launchpad.net/python-jenkins/+bug/1971524 +Patch0: python-python-jenkins-no-mock.patch BuildRequires: %{python_module cmd2} -BuildRequires: %{python_module mock} BuildRequires: %{python_module multi_key_dict} BuildRequires: %{python_module pbr >= 0.8.2} BuildRequires: %{python_module requests-mock >= 1.4} @@ -54,7 +55,7 @@ API. It currently supports management of: * Slave node configuration %prep -%setup -q -n python-jenkins-%{version} +%autosetup -p1 -n python-jenkins-%{version} %build %python_build