Merge "Use unittest.mock instead of third party mock"

castellan/tests/unit/key_manager/test_barbican_key_manager.py

@@ -17,9 +17,9 @@
 Test cases for the barbican key manager.
 """
 import calendar
+from unittest import mock
 
 from barbicanclient import exceptions as barbican_exceptions
-import mock
 from oslo_utils import timeutils
 
 from castellan.common import exception

castellan/tests/unit/key_manager/test_migration_key_manager.py

@@ -18,7 +18,7 @@ Test cases for the migration key manager.
 """
 
 import binascii
-import mock
+from unittest import mock
 
 from oslo_config import cfg