diff options
| -rw-r--r-- | functest/tests/unit/cli/commands/test_cli_env.py | 16 | ||||
| -rw-r--r-- | functest/tests/unit/test_utils.py | 31 |
2 files changed, 13 insertions, 34 deletions
diff --git a/functest/tests/unit/cli/commands/test_cli_env.py b/functest/tests/unit/cli/commands/test_cli_env.py index 2708add2..b5c65377 100644 --- a/functest/tests/unit/cli/commands/test_cli_env.py +++ b/functest/tests/unit/cli/commands/test_cli_env.py @@ -8,13 +8,24 @@ # pylint: disable=missing-docstring import logging +import re import unittest import mock from functest.cli.commands import cli_env from functest.utils.constants import CONST -from functest.tests.unit import test_utils + + +class RegexMatch(object): + def __init__(self, msg): + self.msg = msg + + def __eq__(self, other): + match = re.search(self.msg, other) + if match: + return True + return False class CliEnvTesting(unittest.TestCase): @@ -45,8 +56,7 @@ class CliEnvTesting(unittest.TestCase): with mock.patch('functest.cli.commands.cli_env.click.echo') \ as mock_click_echo: self.cli_environ.show() - mock_click_echo.assert_called_with(test_utils. - RegexMatch(reg_string)) + mock_click_echo.assert_called_with(RegexMatch(reg_string)) def test_show_missing_ci_installer_type(self, *args): self._test_show_missing_env_var('INSTALLER_TYPE', *args) diff --git a/functest/tests/unit/test_utils.py b/functest/tests/unit/test_utils.py deleted file mode 100644 index de8351c7..00000000 --- a/functest/tests/unit/test_utils.py +++ /dev/null @@ -1,31 +0,0 @@ -#!/usr/bin/env python - -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Apache License, Version 2.0 -# which accompanies this distribution, and is available at -# http://www.apache.org/licenses/LICENSE-2.0 - -# pylint: disable=missing-docstring - -import re - - -class RegexMatch(object): - def __init__(self, msg): - self.msg = msg - - def __eq__(self, other): - match = re.search(self.msg, other) - if match: - return True - return False - - -class SubstrMatch(object): - def __init__(self, msg): - self.msg = msg - - def __eq__(self, other): - if self.msg in other: - return True - return False |