Merge "Use unittest.mock instead of mock"

lower-constraints.txt

@@ -19,7 +19,6 @@ linecache2==1.0.0
 lxml==4.5.0
 MarkupSafe==1.1.1
 mccabe==0.2.1
-mock==2.0.0
 openstackdocstheme==2.2.1
 pbr==2.0.0
 pep8==1.5.7

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

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):

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):