Use builtin 'unittest.mock' instead of 'mock'

requirements-dev.txt

@@ -4,7 +4,6 @@ autopep8
 coverage
 flake8
 flexmock
-mock
 pygit2 == 1.10.1 # https://github.com/libgit2/pygit2/issues/1176
 pylint
 pytest

tests/cli/test_gen_payload.py

@@ -5,7 +5,7 @@
 from flexmock import flexmock
 
 import io
-from mock import AsyncMock
+from unittest.mock import AsyncMock
 import yaml
 import openshift as oc
 

tests/cli/test_rpms_build.py

@@ -2,7 +2,7 @@
 import io
 
 import asynctest
-from mock import AsyncMock, MagicMock, Mock, patch
+from unittest.mock import AsyncMock, MagicMock, Mock, patch
 
 from doozerlib import gitdata, rpmcfg
 from doozerlib.cli.rpms_build import _rpms_rebase_and_build

tests/test_brew_inspector.py

@@ -7,7 +7,7 @@
 import logging
 
 import unittest
-from mock import MagicMock, Mock, patch
+from unittest.mock import MagicMock, Mock, patch
 
 from doozerlib.image import BrewBuildImageInspector
 

tests/test_dblib.py

@@ -6,7 +6,6 @@
 import pathlib
 import traceback
 import sys
-import mock
 
 
 class FakeMetaData(object):

tests/test_distgit/test_generic_distgit.py

@@ -4,7 +4,7 @@
 import unittest
 
 from flexmock import flexmock
-import mock
+from unittest import mock
 
 from doozerlib import distgit, model
 from doozerlib.assembly import AssemblyTypes

tests/test_distgit/test_image_distgit/test_image_distgit.py

@@ -8,7 +8,7 @@
 from unittest.mock import Mock, patch
 
 from flexmock import flexmock
-from mock import MagicMock
+from unittest.mock import MagicMock
 
 from doozerlib import distgit, model
 from doozerlib.assembly import AssemblyTypes

tests/test_distgit/test_rpm_distgit.py

@@ -1,7 +1,7 @@
 import unittest
 from pathlib import Path
 
-from mock import Mock, patch
+from unittest.mock import Mock, patch
 
 from doozerlib import distgit, model
 

tests/test_exectools.py

@@ -8,7 +8,7 @@
 import unittest
 
 import asynctest
-import mock
+from unittest import mock
 
 try:
     from importlib import reload

tests/test_image.py

@@ -7,7 +7,7 @@
 import logging
 import tempfile
 import shutil
-import mock
+from unittest import mock
 from flexmock import flexmock
 try:
     from importlib import reload

tests/test_metadata.py

@@ -3,7 +3,7 @@
 import re
 import datetime
 
-from mock import MagicMock, Mock, patch
+from unittest.mock import MagicMock, Mock, patch
 
 from doozerlib.metadata import Metadata, CgitAtomFeedEntry, RebuildHintCode
 from doozerlib.brew import BuildStates

tests/test_olm_bundle.py

@@ -1,7 +1,7 @@
 import unittest
 
 from flexmock import flexmock
-from mock import MagicMock
+from unittest.mock import MagicMock
 
 from doozerlib.olm.bundle import OLMBundle
 

tests/test_plashet.py

@@ -1,7 +1,6 @@
 from unittest import TestCase
 
-from mock import MagicMock, Mock
-from mock.mock import patch
+from unittest.mock import MagicMock, Mock, patch
 
 from doozerlib.model import Model
 from doozerlib.plashet import PlashetBuilder

tests/test_rpm_builder.py

@@ -3,7 +3,7 @@
 from pathlib import Path
 
 import asynctest
-import mock
+from unittest import mock
 
 from doozerlib import distgit, gitdata, rpmcfg
 from doozerlib.exectools import RetryException

tests/test_source_modifications.py

@@ -5,7 +5,7 @@
 import tempfile
 import unittest
 
-import mock
+from unittest import mock
 import yaml.scanner
 
 from doozerlib.source_modifications import (AddModifier, RemoveModifier,