Replace third party mock with unittest.mock

Now that we no longer support older version of Python, there is no need
to use the third party 'mock' library for test mocking and can instead
use the standard library unittest mock module.

Change-Id: I1ea77249834e6c595c88f257226a483633be5f7a
Signed-off-by: Sean McGinnis <sean.mcginnis@gmail.com>

aodh/tests/functional/api/test_app.py

@@ -13,7 +13,8 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import mock
+from unittest import mock
+
 from oslo_config import cfg
 from oslo_config import fixture as fixture_config
 

aodh/tests/functional/api/v2/test_alarm_scenarios.py

@@ -19,9 +19,9 @@ import datetime
 import json as jsonlib
 import operator
 import os
+from unittest import mock
 
 import fixtures
-import mock
 from oslo_utils import uuidutils
 import six
 from six import moves

aodh/tests/functional/api/v2/test_app.py

@@ -16,8 +16,8 @@
 """Test basic aodh-api app
 """
 import json
+from unittest import mock
 
-import mock
 import six
 import wsme
 

aodh/tests/functional/api/v2/test_complex_query.py

@@ -14,10 +14,10 @@
 #    under the License.
 """Test the methods related to complex query."""
 import datetime
+from unittest import mock
 
 import fixtures
 import jsonschema
-import mock
 from oslotest import base
 import wsme
 

aodh/tests/functional/api/v2/test_query.py

@@ -15,9 +15,9 @@
 #    under the License.
 """Test the methods related to query."""
 import datetime
+from unittest import mock
 
 import fixtures
-import mock
 from oslo_utils import timeutils
 from oslotest import base
 import wsme

aodh/tests/functional/gabbi/fixtures.py

@@ -17,9 +17,9 @@
 
 import os
 import unittest
+from unittest import mock
 
 from gabbi import fixture
-import mock
 from oslo_config import cfg
 from oslo_config import fixture as fixture_config
 from oslo_policy import opts

aodh/tests/functional/storage/sqlalchemy/test_migrations.py

@@ -13,8 +13,8 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 import abc
+from unittest import mock
 
-import mock
 from oslo_db.sqlalchemy import test_migrations
 import six
 

aodh/tests/functional/storage/test_get_connection.py

@@ -15,7 +15,8 @@
 # under the License.
 """Tests for aodh/storage/
 """
-import mock
+from unittest import mock
+
 from oslo_config import fixture as fixture_config
 from oslotest import base
 

aodh/tests/functional/storage/test_storage_scenarios.py

@@ -16,8 +16,8 @@
 """
 
 import datetime
+from unittest import mock
 
-import mock
 from oslo_utils import timeutils
 
 from aodh import storage

aodh/tests/unit/evaluator/base.py

@@ -13,7 +13,8 @@
 # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
 # License for the specific language governing permissions and limitations
 # under the License.
-import mock
+from unittest import mock
+
 from oslo_config import fixture
 from oslotest import base
 

aodh/tests/unit/evaluator/test_base.py

@@ -13,8 +13,8 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 import datetime
+from unittest import mock
 
-import mock
 from oslo_utils import timeutils
 from oslotest import base
 

aodh/tests/unit/evaluator/test_composite.py

@@ -12,9 +12,9 @@
 # under the License.
 """Tests for aodh/evaluator/composite.py
 """
+from unittest import mock
 
 import fixtures
-import mock
 from oslo_utils import timeutils
 from oslo_utils import uuidutils
 import six

aodh/tests/unit/evaluator/test_event.py

@@ -16,11 +16,11 @@
 import copy
 import datetime
 import json
-import six
+from unittest import mock
 
-import mock
 from oslo_utils import timeutils
 from oslo_utils import uuidutils
+import six
 
 from aodh import evaluator
 from aodh.evaluator import event as event_evaluator

aodh/tests/unit/evaluator/test_gnocchi.py

@@ -18,9 +18,9 @@ import datetime
 import fixtures
 import json
 import unittest
+from unittest import mock
 
 from gnocchiclient import exceptions
-import mock
 from oslo_utils import timeutils
 from oslo_utils import uuidutils
 import pytz

aodh/tests/unit/evaluator/test_loadbalancer.py

@@ -13,8 +13,8 @@
 #    limitations under the License.
 
 import datetime
+from unittest import mock
 
-import mock
 from oslo_utils import timeutils
 from oslo_utils import uuidutils
 

aodh/tests/unit/notifier/test_heat.py

@@ -12,7 +12,8 @@
 #    See the License for the specific language governing permissions and
 #    limitations under the License.
 
-import mock
+from unittest import mock
+
 from oslo_utils import netutils
 
 from aodh.notifier import heat as heat_notifier

aodh/tests/unit/test_coordination.py

@@ -13,7 +13,8 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-import mock
+from unittest import mock
+
 from oslo_config import fixture as fixture_config
 import tooz.coordination
 

aodh/tests/unit/test_evaluator.py

@@ -16,8 +16,8 @@
 """
 import fixtures
 import time
+from unittest import mock
 
-import mock
 from oslo_config import fixture as fixture_config
 from stevedore import extension
 

aodh/tests/unit/test_event.py

@@ -13,8 +13,8 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-import mock
 import time
+from unittest import mock
 
 from oslo_config import fixture as fixture_config
 import oslo_messaging

aodh/tests/unit/test_notifier.py

@@ -15,8 +15,8 @@
 import fixtures
 import json
 import time
+from unittest import mock
 
-import mock
 from oslo_config import cfg
 from oslo_config import fixture as fixture_config
 

setup.cfg

@@ -49,7 +49,6 @@ test =
     oslotest>=2.15.0 # Apache-2.0
     coverage>=3.6
     fixtures>=1.3.1
-    mock>=1.0
     sqlalchemy-utils
     testrepository>=0.0.18
     testresources>=0.2.4 # Apache-2.0/BSD