From ff53c4435df9e3658fd647626764f6d06eac4593 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Herv=C3=A9=20Beraud?= Date: Tue, 9 Jun 2020 12:11:08 +0200 Subject: [PATCH] Use unittest.mock instead of mock The mock third party library was needed for mock support in py2 runtimes. Since we now only support py36 and later, we can use the standard lib unittest.mock module instead. Change-Id: Ib3847b49f41c054b998072d0fbd0648b5293af5b --- sahara_tests/unit/scenario/test_base.py | 2 +- sahara_tests/unit/scenario/test_runner.py | 2 +- sahara_tests/unit/scenario/test_utils.py | 2 +- test-requirements.txt | 1 - 4 files changed, 3 insertions(+), 4 deletions(-) diff --git a/sahara_tests/unit/scenario/test_base.py b/sahara_tests/unit/scenario/test_base.py index 58713f4a..8d6f9856 100644 --- a/sahara_tests/unit/scenario/test_base.py +++ b/sahara_tests/unit/scenario/test_base.py @@ -13,7 +13,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -import mock +from unittest import mock from saharaclient.api import cluster_templates from saharaclient.api import clusters from saharaclient.api import data_sources diff --git a/sahara_tests/unit/scenario/test_runner.py b/sahara_tests/unit/scenario/test_runner.py index 959d2451..68da08e6 100644 --- a/sahara_tests/unit/scenario/test_runner.py +++ b/sahara_tests/unit/scenario/test_runner.py @@ -18,7 +18,7 @@ import sys from jsonschema import exceptions import pkg_resources as pkg -import mock +from unittest import mock import testtools from sahara_tests import version diff --git a/sahara_tests/unit/scenario/test_utils.py b/sahara_tests/unit/scenario/test_utils.py index 0d6d587f..8368964e 100644 --- a/sahara_tests/unit/scenario/test_utils.py +++ b/sahara_tests/unit/scenario/test_utils.py @@ -13,7 +13,7 @@ import os -import mock +from unittest import mock import testtools from sahara_tests.scenario import utils diff --git a/test-requirements.txt b/test-requirements.txt index 51b2077b..b590895e 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -8,5 +8,4 @@ bandit!=1.6.0 bashate>=0.2 # Apache-2.0 coverage>=3.6 # Apache-2.0 doc8 # Apache-2.0 -mock>=1.2 # BSD pylint==1.4.5 # GNU GPL v2