Merge "Remove the dependency on the "mock" package"

ovsdbapp/tests/base.py

@@ -15,7 +15,8 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-import mock
+from unittest import mock
+
 from oslotest import base
 
 

ovsdbapp/tests/functional/schema/open_vswitch/test_impl_idl.py

@@ -13,7 +13,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-import mock
+from unittest import mock
 
 from ovsdbapp import exceptions as exc
 from ovsdbapp.schema.open_vswitch import impl_idl

ovsdbapp/tests/unit/backend/ovs_idl/test_connection.py

@@ -12,7 +12,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import mock
+from unittest import mock
 
 from ovs import poller
 

ovsdbapp/tests/unit/backend/ovs_idl/test_idlutils.py

@@ -12,7 +12,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import mock
+from unittest import mock
 
 from ovsdbapp import api
 from ovsdbapp.backend.ovs_idl import idlutils

ovsdbapp/tests/unit/backend/test_ovs_idl.py

@@ -10,7 +10,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-import mock
+from unittest import mock
 
 from ovsdbapp.backend import ovs_idl
 from ovsdbapp.backend.ovs_idl import idlutils

ovsdbapp/tests/unit/schema/open_vswitch/test_impl_idl.py

@@ -12,7 +12,8 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import mock
+from unittest import mock
+
 import testtools
 
 from ovsdbapp import exceptions

ovsdbapp/tests/unit/test_api.py

@@ -13,9 +13,9 @@
 #    under the License.
 
 import sys
+from unittest import mock
 
 import fixtures
-import mock
 import testtools
 
 from ovsdbapp import api