Merge "Use unittest.mock instead of mock"

test-requirements.txt

@@ -9,7 +9,6 @@
 #
 charm-tools>=2.4.4
 requests>=2.18.4
-mock>=1.2
 flake8>=2.2.4,<=2.4.1
 stestr>=2.2.0
 coverage>=4.5.2

unit_tests/test_actions.py

@@ -1,6 +1,6 @@
 import sys
-import mock
-from mock import MagicMock
+from unittest import mock
+from unittest.mock import MagicMock
 
 from test_utils import CharmTestCase
 

unit_tests/test_actions_openstack_upgrade.py

@@ -1,4 +1,4 @@
-from mock import patch
+from unittest.mock import patch
 import os
 
 from test_utils import (

unit_tests/test_neutron_contexts.py

@@ -2,7 +2,7 @@ import io
 
 from contextlib import contextmanager
 
-from mock import (
+from unittest.mock import (
     MagicMock,
     patch
 )

unit_tests/test_neutron_hooks.py

@@ -1,6 +1,6 @@
 import sys
 
-from mock import MagicMock, patch, call
+from unittest.mock import MagicMock, patch, call
 
 # python-apt is not installed as part of test-requirements but is imported by
 # some charmhelpers modules so create a fake import.

unit_tests/test_neutron_utils.py

@@ -1,4 +1,4 @@
-from mock import MagicMock, call, patch, ANY
+from unittest.mock import MagicMock, call, patch, ANY
 
 import charmhelpers.core.hookenv as hookenv
 import neutron_utils

unit_tests/test_utils.py

@@ -4,7 +4,7 @@ import logging
 import unittest
 import yaml
 
-from mock import patch
+from unittest.mock import patch
 
 
 def load_config():