summaryrefslogtreecommitdiff
path: root/saharaclient/tests/unit/osc/v2
diff options
context:
space:
mode:
Diffstat (limited to 'saharaclient/tests/unit/osc/v2')
-rw-r--r--saharaclient/tests/unit/osc/v2/test_clusters.py2
-rw-r--r--saharaclient/tests/unit/osc/v2/test_data_sources.py2
-rw-r--r--saharaclient/tests/unit/osc/v2/test_images.py2
-rw-r--r--saharaclient/tests/unit/osc/v2/test_job_binaries.py2
-rw-r--r--saharaclient/tests/unit/osc/v2/test_job_templates.py2
-rw-r--r--saharaclient/tests/unit/osc/v2/test_job_types.py2
-rw-r--r--saharaclient/tests/unit/osc/v2/test_jobs.py2
-rw-r--r--saharaclient/tests/unit/osc/v2/test_node_group_templates.py2
-rw-r--r--saharaclient/tests/unit/osc/v2/test_plugins.py3
9 files changed, 10 insertions, 9 deletions
diff --git a/saharaclient/tests/unit/osc/v2/test_clusters.py b/saharaclient/tests/unit/osc/v2/test_clusters.py
index 6bbb725..99c07b6 100644
--- a/saharaclient/tests/unit/osc/v2/test_clusters.py
+++ b/saharaclient/tests/unit/osc/v2/test_clusters.py
@@ -13,8 +13,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-import mock
from osc_lib.tests import utils as osc_utils
+from unittest import mock
from saharaclient.api import cluster_templates as api_ct
from saharaclient.api import clusters as api_cl
diff --git a/saharaclient/tests/unit/osc/v2/test_data_sources.py b/saharaclient/tests/unit/osc/v2/test_data_sources.py
index 27af0b5..1c2c389 100644
--- a/saharaclient/tests/unit/osc/v2/test_data_sources.py
+++ b/saharaclient/tests/unit/osc/v2/test_data_sources.py
@@ -13,8 +13,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-import mock
from osc_lib.tests import utils as osc_utils
+from unittest import mock
from saharaclient.api import data_sources as api_ds
from saharaclient.osc.v1 import data_sources as osc_ds
diff --git a/saharaclient/tests/unit/osc/v2/test_images.py b/saharaclient/tests/unit/osc/v2/test_images.py
index 4e94001..1855bdf 100644
--- a/saharaclient/tests/unit/osc/v2/test_images.py
+++ b/saharaclient/tests/unit/osc/v2/test_images.py
@@ -13,8 +13,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-import mock
from osc_lib.tests import utils as osc_utils
+from unittest import mock
from saharaclient.api import images as api_images
from saharaclient.osc.v1 import images as osc_images
diff --git a/saharaclient/tests/unit/osc/v2/test_job_binaries.py b/saharaclient/tests/unit/osc/v2/test_job_binaries.py
index ee94e83..93d889a 100644
--- a/saharaclient/tests/unit/osc/v2/test_job_binaries.py
+++ b/saharaclient/tests/unit/osc/v2/test_job_binaries.py
@@ -13,9 +13,9 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-import mock
from osc_lib.tests import utils as osc_u
import testtools
+from unittest import mock
from saharaclient.api import job_binaries as api_jb
from saharaclient.osc.v1 import job_binaries as osc_jb
diff --git a/saharaclient/tests/unit/osc/v2/test_job_templates.py b/saharaclient/tests/unit/osc/v2/test_job_templates.py
index 4060fb3..08d6c26 100644
--- a/saharaclient/tests/unit/osc/v2/test_job_templates.py
+++ b/saharaclient/tests/unit/osc/v2/test_job_templates.py
@@ -13,8 +13,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-import mock
from osc_lib.tests import utils as osc_utils
+from unittest import mock
from saharaclient.api.v2 import job_templates as api_j
from saharaclient.osc.v2 import job_templates as osc_j
diff --git a/saharaclient/tests/unit/osc/v2/test_job_types.py b/saharaclient/tests/unit/osc/v2/test_job_types.py
index 130f218..477f147 100644
--- a/saharaclient/tests/unit/osc/v2/test_job_types.py
+++ b/saharaclient/tests/unit/osc/v2/test_job_types.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 job_types as api_jt
from saharaclient.api.v2 import job_templates as api_job_templates
diff --git a/saharaclient/tests/unit/osc/v2/test_jobs.py b/saharaclient/tests/unit/osc/v2/test_jobs.py
index 5eb0e3b..5c880db 100644
--- a/saharaclient/tests/unit/osc/v2/test_jobs.py
+++ b/saharaclient/tests/unit/osc/v2/test_jobs.py
@@ -13,8 +13,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-import mock
from osc_lib.tests import utils as osc_utils
+from unittest import mock
from saharaclient.api.v2 import jobs as api_j
from saharaclient.osc.v2 import jobs as osc_j
diff --git a/saharaclient/tests/unit/osc/v2/test_node_group_templates.py b/saharaclient/tests/unit/osc/v2/test_node_group_templates.py
index 3eef3b0..5555262 100644
--- a/saharaclient/tests/unit/osc/v2/test_node_group_templates.py
+++ b/saharaclient/tests/unit/osc/v2/test_node_group_templates.py
@@ -13,8 +13,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-import mock
from osc_lib.tests import utils as osc_utils
+from unittest import mock
from saharaclient.api import node_group_templates as api_ngt
from saharaclient.osc.v2 import node_group_templates as osc_ngt
diff --git a/saharaclient/tests/unit/osc/v2/test_plugins.py b/saharaclient/tests/unit/osc/v2/test_plugins.py
index 6fcf972..ae72e83 100644
--- a/saharaclient/tests/unit/osc/v2/test_plugins.py
+++ b/saharaclient/tests/unit/osc/v2/test_plugins.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
+
from oslo_serialization import jsonutils as json
from saharaclient.api import plugins as api_plugins