93c9a0355b
* Unable to locate upstream changelog. - Re-add missing BuildRequires on six. - Stop using greedy globs in %files. - Rebase python-jenkinsapi-no-mock.patch - Add missing Requires on update-alternatives - Switch to autosetup ------------------------------------------------------------------ OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-jenkinsapi?expand=0&rev=21
128 lines
5.1 KiB
Diff
128 lines
5.1 KiB
Diff
Index: jenkinsapi-0.3.13/jenkinsapi_tests/unittests/test_artifact.py
|
|
===================================================================
|
|
--- jenkinsapi-0.3.13.orig/jenkinsapi_tests/unittests/test_artifact.py
|
|
+++ jenkinsapi-0.3.13/jenkinsapi_tests/unittests/test_artifact.py
|
|
@@ -1,5 +1,5 @@
|
|
import pytest
|
|
-from mock import Mock, patch, call
|
|
+from unittest.mock import Mock, patch, call
|
|
from requests.exceptions import HTTPError
|
|
from jenkinsapi.artifact import Artifact
|
|
from jenkinsapi.jenkinsbase import JenkinsBase
|
|
Index: jenkinsapi-0.3.13/jenkinsapi_tests/unittests/test_executors.py
|
|
===================================================================
|
|
--- jenkinsapi-0.3.13.orig/jenkinsapi_tests/unittests/test_executors.py
|
|
+++ jenkinsapi-0.3.13/jenkinsapi_tests/unittests/test_executors.py
|
|
@@ -1,5 +1,5 @@
|
|
import pytest
|
|
-import mock
|
|
+from unittest import mock
|
|
from jenkinsapi.jenkins import Jenkins
|
|
from jenkinsapi.executors import Executors
|
|
from jenkinsapi.executor import Executor
|
|
Index: jenkinsapi-0.3.13/jenkinsapi_tests/unittests/test_job_folders.py
|
|
===================================================================
|
|
--- jenkinsapi-0.3.13.orig/jenkinsapi_tests/unittests/test_job_folders.py
|
|
+++ jenkinsapi-0.3.13/jenkinsapi_tests/unittests/test_job_folders.py
|
|
@@ -1,5 +1,5 @@
|
|
import pytest
|
|
-import mock
|
|
+from unittest import mock
|
|
from jenkinsapi.jenkins import JenkinsBase
|
|
|
|
|
|
Index: jenkinsapi-0.3.13/jenkinsapi_tests/unittests/test_job_get_all_builds.py
|
|
===================================================================
|
|
--- jenkinsapi-0.3.13.orig/jenkinsapi_tests/unittests/test_job_get_all_builds.py
|
|
+++ jenkinsapi-0.3.13/jenkinsapi_tests/unittests/test_job_get_all_builds.py
|
|
@@ -1,4 +1,4 @@
|
|
-import mock
|
|
+from unittest import mock
|
|
|
|
# To run unittests on python 2.6 please use unittest2 library
|
|
try:
|
|
Index: jenkinsapi-0.3.13/jenkinsapi_tests/unittests/test_job.py
|
|
===================================================================
|
|
--- jenkinsapi-0.3.13.orig/jenkinsapi_tests/unittests/test_job.py
|
|
+++ jenkinsapi-0.3.13/jenkinsapi_tests/unittests/test_job.py
|
|
@@ -1,6 +1,6 @@
|
|
# -*- coding: utf-8 -*-
|
|
import pytest
|
|
-import mock
|
|
+from unittest import mock
|
|
import json
|
|
from . import configs
|
|
from jenkinsapi.job import Job
|
|
Index: jenkinsapi-0.3.13/jenkinsapi_tests/unittests/test_plugins.py
|
|
===================================================================
|
|
--- jenkinsapi-0.3.13.orig/jenkinsapi_tests/unittests/test_plugins.py
|
|
+++ jenkinsapi-0.3.13/jenkinsapi_tests/unittests/test_plugins.py
|
|
@@ -1,7 +1,7 @@
|
|
"""
|
|
jenkinsapi_tests.test_plugins
|
|
"""
|
|
-import mock
|
|
+from unittest import mock
|
|
|
|
# To run unittests on python 2.6 please use unittest2 library
|
|
try:
|
|
@@ -226,7 +226,7 @@ class TestPlugins(unittest.TestCase):
|
|
@mock.patch.object(Plugins, "_poll")
|
|
@mock.patch.object(Plugins, "plugin_version_already_installed")
|
|
@mock.patch.object(
|
|
- Plugins, "restart_required", new_callable=mock.mock.PropertyMock
|
|
+ Plugins, "restart_required", new_callable=mock.PropertyMock
|
|
)
|
|
@mock.patch.object(Plugins, "_wait_until_plugin_installed")
|
|
@mock.patch.object(Requester, "post_xml_and_confirm_status")
|
|
@@ -252,7 +252,7 @@ class TestPlugins(unittest.TestCase):
|
|
@mock.patch.object(Plugins, "_poll")
|
|
@mock.patch.object(Plugins, "plugin_version_already_installed")
|
|
@mock.patch.object(
|
|
- Plugins, "restart_required", new_callable=mock.mock.PropertyMock
|
|
+ Plugins, "restart_required", new_callable=mock.PropertyMock
|
|
)
|
|
@mock.patch.object(Plugins, "_wait_until_plugin_installed")
|
|
@mock.patch.object(Requester, "post_xml_and_confirm_status")
|
|
@@ -316,7 +316,7 @@ class TestPlugins(unittest.TestCase):
|
|
@mock.patch.object(
|
|
Plugins,
|
|
"update_center_install_status",
|
|
- new_callable=mock.mock.PropertyMock,
|
|
+ new_callable=mock.PropertyMock,
|
|
)
|
|
def test_restart_required_after_plugin_installation(
|
|
self, status, _poll_plugins
|
|
@@ -343,7 +343,7 @@ class TestPlugins(unittest.TestCase):
|
|
@mock.patch.object(
|
|
Plugins,
|
|
"update_center_install_status",
|
|
- new_callable=mock.mock.PropertyMock,
|
|
+ new_callable=mock.PropertyMock,
|
|
)
|
|
def test_restart_not_required_after_plugin_installation(
|
|
self, status, _poll_plugins
|
|
Index: jenkinsapi-0.3.13/jenkinsapi_tests/unittests/test_requester.py
|
|
===================================================================
|
|
--- jenkinsapi-0.3.13.orig/jenkinsapi_tests/unittests/test_requester.py
|
|
+++ jenkinsapi-0.3.13/jenkinsapi_tests/unittests/test_requester.py
|
|
@@ -3,7 +3,7 @@ import pytest
|
|
import requests
|
|
from jenkinsapi.jenkins import Requester
|
|
from jenkinsapi.custom_exceptions import JenkinsAPIException
|
|
-from mock import patch
|
|
+from unittest.mock import patch
|
|
|
|
|
|
def test_no_parameters_uses_default_values():
|
|
Index: jenkinsapi-0.3.13/jenkinsapi_tests/unittests/test_result_set.py
|
|
===================================================================
|
|
--- jenkinsapi-0.3.13.orig/jenkinsapi_tests/unittests/test_result_set.py
|
|
+++ jenkinsapi-0.3.13/jenkinsapi_tests/unittests/test_result_set.py
|
|
@@ -1,4 +1,4 @@
|
|
-import mock
|
|
+from unittest import mock
|
|
|
|
# To run unittests on python 2.6 please use unittest2 library
|
|
try:
|