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

blazarclient/tests/test_base.py

@@ -14,7 +14,7 @@
 # limitations under the License.
 
 
-import mock
+from unittest import mock
 
 from blazarclient import base
 from blazarclient import exception

blazarclient/tests/test_command.py

@@ -13,7 +13,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import mock
+from unittest import mock
+
 import testtools
 
 from blazarclient import command

blazarclient/tests/v1/shell_commands/test_floatingips.py

@@ -14,7 +14,7 @@
 # limitations under the License.
 
 import argparse
-import mock
+from unittest import mock
 
 from blazarclient import shell
 from blazarclient import tests

blazarclient/tests/v1/shell_commands/test_hosts.py

@@ -14,7 +14,7 @@
 # limitations under the License.
 
 import argparse
-import mock
+from unittest import mock
 
 from blazarclient import shell
 from blazarclient import tests

blazarclient/tests/v1/shell_commands/test_leases.py

@@ -15,7 +15,7 @@
 
 import argparse
 from datetime import datetime
-import mock
+from unittest import mock
 
 from blazarclient import exception
 from blazarclient import shell

lower-constraints.txt

@@ -9,7 +9,6 @@ fixtures==3.0.0
 iso8601==0.1.11
 keystoneauth1==3.4.0
 linecache2==1.0.0
-mock==3.0.0
 monotonic==0.6
 mox3==0.20.0
 msgpack-python==0.4.0

test-requirements.txt

@@ -7,7 +7,6 @@ hacking>=1.1.0,<3.0.1 # Apache-2.0
 # care of pyflakes version compatibilty.
 pyflakes>=2.1.1
 
-mock>=3.0.0 # BSD
 oslotest>=3.2.0 # Apache-2.0
 fixtures>=3.0.0 # Apache-2.0/BSD
 testrepository>=0.0.18 # Apache-2.0/BSD