diff options
| author |   Cedric Ollivier <cedric.ollivier@orange.com> | 2018-02-13 20:36:01 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2018-02-13 20:36:01 +0000 |
| commit | e3299f119c93a57e00d1aaeeb1f7073a1adf7b87 (patch) | |
| tree | d2d5fe3e3afcb3f86343947957db0b18786f7452 /functest/tests | |
| parent | 7ccd4189200f3fc1bf1429ea4fb7e6001bce7803 (diff) | |
| parent | 0424a6d98739ac7499c28799570ea8a625c0779c (diff) | |
Merge "Remove INSTALLER_IP from Functest"
Diffstat (limited to 'functest/tests')
| -rw-r--r-- | functest/tests/unit/cli/commands/test_cli_env.py | 6 | ||||
| -rw-r--r-- | functest/tests/unit/cli/commands/test_cli_os.py | 1 |
2 files changed, 0 insertions, 7 deletions
diff --git a/functest/tests/unit/cli/commands/test_cli_env.py b/functest/tests/unit/cli/commands/test_cli_env.py index d17da166..7d6f7787 100644 --- a/functest/tests/unit/cli/commands/test_cli_env.py +++ b/functest/tests/unit/cli/commands/test_cli_env.py @@ -36,9 +36,6 @@ class CliEnvTesting(unittest.TestCase): if var == 'INSTALLER_TYPE': os.environ['INSTALLER_TYPE'] = '' reg_string = r"| INSTALLER: Unknown, \S+\s*|" - elif var == 'INSTALLER_IP': - os.environ['INSTALLER_IP'] = '' - reg_string = r"| INSTALLER: \S+, Unknown\s*|" elif var == 'SCENARIO': os.environ['DEPLOY_SCENARIO'] = '' reg_string = r"| SCENARIO: Unknown\s*|" @@ -57,9 +54,6 @@ class CliEnvTesting(unittest.TestCase): def test_show_ci_installer_type_ko(self, *args): self._test_show_missing_env_var('INSTALLER_TYPE', *args) - def test_show_ci_installer_ip_ko(self, *args): - self._test_show_missing_env_var('INSTALLER_IP', *args) - def test_show_missing_ci_scenario(self, *args): self._test_show_missing_env_var('SCENARIO', *args) diff --git a/functest/tests/unit/cli/commands/test_cli_os.py b/functest/tests/unit/cli/commands/test_cli_os.py index 02392d2d..a5e562a2 100644 --- a/functest/tests/unit/cli/commands/test_cli_os.py +++ b/functest/tests/unit/cli/commands/test_cli_os.py @@ -23,7 +23,6 @@ class CliOpenStackTesting(unittest.TestCase): self.endpoint_ip = 'test_ip' self.os_auth_url = 'http://test_ip:test_port/v2.0' self.installer_type = 'test_installer_type' - self.installer_ip = 'test_installer_ip' self.openstack_creds = 'test_env_file' self.snapshot_file = 'test_snapshot_file' os.environ["OS_AUTH_URL"] = '' |