From ca361d3e007a69a8873d529d3b8d0e0186d13694 Mon Sep 17 00:00:00 2001 From: "wu.chunyang" Date: Wed, 27 May 2020 22:06:30 +0800 Subject: Use unittest.mock instead of third party mock we currently don't support py2 and py3 has removed mock to unittest module. Change-Id: I5c13f6d2edc219957f5902227497aa24249ea74e --- cliff/tests/test_app.py | 2 +- cliff/tests/test_command_hooks.py | 2 +- cliff/tests/test_commandmanager.py | 2 +- cliff/tests/test_complete.py | 2 +- cliff/tests/test_formatters_csv.py | 2 +- cliff/tests/test_formatters_json.py | 2 +- cliff/tests/test_formatters_shell.py | 4 ++-- cliff/tests/test_formatters_table.py | 2 +- cliff/tests/test_formatters_yaml.py | 4 ++-- cliff/tests/test_help.py | 2 +- cliff/tests/test_lister.py | 4 ++-- cliff/tests/test_show.py | 4 ++-- cliff/tests/test_utils.py | 2 +- 13 files changed, 17 insertions(+), 17 deletions(-) diff --git a/cliff/tests/test_app.py b/cliff/tests/test_app.py index 88e85b8..d24c62b 100644 --- a/cliff/tests/test_app.py +++ b/cliff/tests/test_app.py @@ -21,8 +21,8 @@ except ImportError: from io import StringIO import sys -import mock import six +from unittest import mock from cliff import app as application from cliff import command as c_cmd diff --git a/cliff/tests/test_command_hooks.py b/cliff/tests/test_command_hooks.py index b8c7c4d..63dcbb3 100644 --- a/cliff/tests/test_command_hooks.py +++ b/cliff/tests/test_command_hooks.py @@ -18,8 +18,8 @@ from cliff import lister from cliff import show from cliff.tests import base -import mock from stevedore import extension +from unittest import mock def make_app(**kwargs): diff --git a/cliff/tests/test_commandmanager.py b/cliff/tests/test_commandmanager.py index fae9d0a..27b97d6 100644 --- a/cliff/tests/test_commandmanager.py +++ b/cliff/tests/test_commandmanager.py @@ -10,8 +10,8 @@ # License for the specific language governing permissions and limitations # under the License. -import mock import testscenarios +from unittest import mock from cliff import command from cliff import commandmanager diff --git a/cliff/tests/test_complete.py b/cliff/tests/test_complete.py index a4f8dc4..1e7da6b 100644 --- a/cliff/tests/test_complete.py +++ b/cliff/tests/test_complete.py @@ -13,7 +13,7 @@ """Bash completion tests """ -import mock +from unittest import mock from cliff import app as application from cliff import commandmanager diff --git a/cliff/tests/test_formatters_csv.py b/cliff/tests/test_formatters_csv.py index 001f169..1767705 100644 --- a/cliff/tests/test_formatters_csv.py +++ b/cliff/tests/test_formatters_csv.py @@ -16,8 +16,8 @@ import argparse import unittest -import mock import six +from unittest import mock from cliff.formatters import commaseparated from cliff.tests import test_columns diff --git a/cliff/tests/test_formatters_json.py b/cliff/tests/test_formatters_json.py index 2f3a6e9..95e3218 100644 --- a/cliff/tests/test_formatters_json.py +++ b/cliff/tests/test_formatters_json.py @@ -18,8 +18,8 @@ from cliff.formatters import json_format from cliff.tests import base from cliff.tests import test_columns -import mock import six +from unittest import mock class TestJSONFormatter(base.TestBase): diff --git a/cliff/tests/test_formatters_shell.py b/cliff/tests/test_formatters_shell.py index a6929a3..01b4e84 100644 --- a/cliff/tests/test_formatters_shell.py +++ b/cliff/tests/test_formatters_shell.py @@ -15,12 +15,12 @@ import argparse import six +from unittest import mock + from cliff.formatters import shell from cliff.tests import base from cliff.tests import test_columns -import mock - class TestShellFormatter(base.TestBase): diff --git a/cliff/tests/test_formatters_table.py b/cliff/tests/test_formatters_table.py index 7627359..a11ff43 100644 --- a/cliff/tests/test_formatters_table.py +++ b/cliff/tests/test_formatters_table.py @@ -16,8 +16,8 @@ import argparse import os import textwrap -import mock from six import StringIO +from unittest import mock from cliff.formatters import table from cliff.tests import base diff --git a/cliff/tests/test_formatters_yaml.py b/cliff/tests/test_formatters_yaml.py index b6147d8..a76be85 100644 --- a/cliff/tests/test_formatters_yaml.py +++ b/cliff/tests/test_formatters_yaml.py @@ -15,12 +15,12 @@ import six import yaml +from unittest import mock + from cliff.formatters import yaml_format from cliff.tests import base from cliff.tests import test_columns -import mock - class TestYAMLFormatter(base.TestBase): diff --git a/cliff/tests/test_help.py b/cliff/tests/test_help.py index b727a16..1b86cba 100644 --- a/cliff/tests/test_help.py +++ b/cliff/tests/test_help.py @@ -17,7 +17,7 @@ except ImportError: import os import sys -import mock +from unittest import mock from cliff import app as application from cliff import commandmanager diff --git a/cliff/tests/test_lister.py b/cliff/tests/test_lister.py index 05061db..8603004 100644 --- a/cliff/tests/test_lister.py +++ b/cliff/tests/test_lister.py @@ -14,11 +14,11 @@ import weakref +from unittest import mock + from cliff import lister from cliff.tests import base -import mock - class FauxFormatter(object): diff --git a/cliff/tests/test_show.py b/cliff/tests/test_show.py index ab185e2..41e13b6 100644 --- a/cliff/tests/test_show.py +++ b/cliff/tests/test_show.py @@ -14,11 +14,11 @@ import weakref +from unittest import mock + from cliff import show from cliff.tests import base -import mock - class FauxFormatter(object): diff --git a/cliff/tests/test_utils.py b/cliff/tests/test_utils.py index 9d6b1f6..5386e82 100644 --- a/cliff/tests/test_utils.py +++ b/cliff/tests/test_utils.py @@ -17,7 +17,7 @@ import struct import sys import unittest -import mock +from unittest import mock from cliff import utils from cliff.tests import base -- cgit v1.2.1