Merge "Use unittest.mock instead of mock"

charms_openstack/test_mocks.py

@@ -1,5 +1,5 @@
 import sys
-import mock
+from unittest import mock
 
 charmhelpers = None
 

charms_openstack/test_utils.py

@@ -13,7 +13,7 @@
 # limitations under the License.
 
 import itertools
-import mock
+from unittest import mock
 import unittest
 
 import charmhelpers.core.unitdata as unitdata

test-requirements.txt

@@ -6,5 +6,4 @@ flake8>=2.2.4
 stestr
 paramiko<2.0
 charms.reactive
-mock>=1.2
 coverage>=3.6

unit_tests/__init__.py

@@ -13,7 +13,7 @@
 # limitations under the License.
 
 import sys
-import mock
+from unittest import mock
 import os
 
 # mock out some charmhelpers libraries as they have apt install side effects

unit_tests/charms_openstack/charm/test_classes.py

@@ -1,5 +1,5 @@
 import base64
-import mock
+from unittest import mock
 
 import unit_tests.utils as utils
 from unit_tests.charms_openstack.charm.utils import (

unit_tests/charms_openstack/charm/test_core.py

@@ -1,5 +1,5 @@
 import collections
-import mock
+from unittest import mock
 import unittest
 
 import charms_openstack.charm.core as chm_core

unit_tests/charms_openstack/charm/test_defaults.py

@@ -1,5 +1,5 @@
 import collections
-import mock
+from unittest import mock
 
 import charms_openstack.charm.core as chm_core
 import charms_openstack.charm.defaults as chm

unit_tests/charms_openstack/charm/utils.py

@@ -1,4 +1,4 @@
-import mock
+from unittest import mock
 
 import unit_tests.utils
 

unit_tests/charms_openstack/plugins/test_adapters.py

@@ -21,7 +21,7 @@
 # sys.modules['charmhelpers.contrib.network.ip'] = mock.MagicMock()
 
 import unittest
-import mock
+from unittest import mock
 
 import charms_openstack.adapters as c_adapters
 import charms_openstack.plugins.adapters as pl_adapters

unit_tests/charms_openstack/plugins/test_classes.py

@@ -1,4 +1,4 @@
-import mock
+from unittest import mock
 import os
 import subprocess
 

unit_tests/test_charms_openstack_adapters.py

@@ -22,7 +22,7 @@
 
 import copy
 import unittest
-import mock
+from unittest import mock
 
 import charms.reactive as reactive
 

unit_tests/test_charms_openstack_bus.py

@@ -17,7 +17,7 @@
 import os
 import unittest
 
-import mock
+from unittest import mock
 
 import charms_openstack.bus as bus
 

unit_tests/test_charms_openstack_devices_pci.py

@@ -19,7 +19,7 @@
 # mock out some charmhelpers libraries as they have apt install side effects
 # sys.modules['charmhelpers.contrib.openstack.utils'] = mock.MagicMock()
 # sys.modules['charmhelpers.contrib.network.ip'] = mock.MagicMock()
-import mock
+from unittest import mock
 
 import charms_openstack.devices.pci as pci
 import unit_tests.pci_responses as pci_responses

unit_tests/utils.py

@@ -17,7 +17,7 @@
 
 import contextlib
 import io
-import mock
+from unittest import mock
 import unittest