From 24fc79fe2451cc6deb1b4374edf65692dc219792 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Herv=C3=A9=20Beraud?= Date: Tue, 9 Jun 2020 10:51:19 +0200 Subject: [PATCH] Use unittest.mock instead of mock The mock third party library was needed for mock support in py2 runtimes. Since we now only support py36 and later, we can use the standard lib unittest.mock module instead. Change-Id: I453515f347a59f4c6f60e0dcba2c327cf2a40426 --- lower-constraints.txt | 1 - test-requirements.txt | 3 --- test/test_pipelines.py | 2 +- test/test_sitemap_file.py | 2 +- 4 files changed, 2 insertions(+), 6 deletions(-) diff --git a/lower-constraints.txt b/lower-constraints.txt index c125cb77..db3c9836 100644 --- a/lower-constraints.txt +++ b/lower-constraints.txt @@ -20,7 +20,6 @@ linecache2==1.0.0 lxml==3.4.1 MarkupSafe==1.0 mccabe==0.2.1 -mock==2.0.0 openstackdocstheme==2.2.1 pbr==2.0.0 pep8==1.5.7 diff --git a/test-requirements.txt b/test-requirements.txt index 990511da..a96ceebe 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -13,6 +13,3 @@ pylint==1.7.1 # GPLv2 reno>=3.1.0 # Apache-2.0 openstackdocstheme>=2.2.1 # Apache-2.0 stestr>=2.0.0 # Apache-2.0 - -# mock object framework -mock>=2.0.0 # BSD diff --git a/test/test_pipelines.py b/test/test_pipelines.py index a1ce3f1b..63f1b7a6 100644 --- a/test/test_pipelines.py +++ b/test/test_pipelines.py @@ -10,9 +10,9 @@ # License for the specific language governing permissions and limitations # under the License. -import mock from sitemap.generator import pipelines import unittest +from unittest import mock class TestSitemapItemExporter(unittest.TestCase): diff --git a/test/test_sitemap_file.py b/test/test_sitemap_file.py index 68e59ca0..9797415f 100644 --- a/test/test_sitemap_file.py +++ b/test/test_sitemap_file.py @@ -10,10 +10,10 @@ # License for the specific language governing permissions and limitations # under the License. -import mock import scrapy from sitemap.generator.spiders import sitemap_file import unittest +from unittest import mock class TestSitemapItem(unittest.TestCase):