diff options
| author | TerryHowe <terrylhowe@gmail.com> | 2015-05-28 11:01:13 -0600 |
|---|---|---|
| committer | TerryHowe <terrylhowe@gmail.com> | 2015-05-28 11:01:13 -0600 |
| commit | 211c14c638b9bf393932be42d4f04a4dd12a84bc (patch) | |
| tree | 88a6f29e5d42d29db758aa1db9a109c5e69083ae /openstackclient/tests/test_shell.py | |
| parent | e8655f44f07db36d05043ef8e15796e75ec380ba (diff) | |
| download | python-openstackclient-211c14c638b9bf393932be42d4f04a4dd12a84bc.tar.gz | |
Fix shell tests
Personally, I think these tests should be removed, they are
testing OCC. An internal OCC change on a private method broke
this test.
Change-Id: I760bf90ef8bd97e30be7838874337be695d45285
Diffstat (limited to 'openstackclient/tests/test_shell.py')
| -rw-r--r-- | openstackclient/tests/test_shell.py | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/openstackclient/tests/test_shell.py b/openstackclient/tests/test_shell.py index 492b60de..a3250f17 100644 --- a/openstackclient/tests/test_shell.py +++ b/openstackclient/tests/test_shell.py @@ -559,7 +559,7 @@ class TestShellCli(TestShell): @mock.patch("os_client_config.config.OpenStackConfig._load_config_file") def test_shell_args_cloud_no_vendor(self, config_mock): - config_mock.return_value = copy.deepcopy(CLOUD_1) + config_mock.return_value = ('file.yaml', copy.deepcopy(CLOUD_1)) _shell = make_shell() fake_execute( @@ -596,8 +596,8 @@ class TestShellCli(TestShell): @mock.patch("os_client_config.config.OpenStackConfig._load_vendor_file") @mock.patch("os_client_config.config.OpenStackConfig._load_config_file") def test_shell_args_cloud_public(self, config_mock, public_mock): - config_mock.return_value = copy.deepcopy(CLOUD_2) - public_mock.return_value = copy.deepcopy(PUBLIC_1) + config_mock.return_value = ('file.yaml', copy.deepcopy(CLOUD_2)) + public_mock.return_value = ('file.yaml', copy.deepcopy(PUBLIC_1)) _shell = make_shell() fake_execute( @@ -636,8 +636,8 @@ class TestShellCli(TestShell): @mock.patch("os_client_config.config.OpenStackConfig._load_vendor_file") @mock.patch("os_client_config.config.OpenStackConfig._load_config_file") def test_shell_args_precedence(self, config_mock, vendor_mock): - config_mock.return_value = copy.deepcopy(CLOUD_2) - vendor_mock.return_value = copy.deepcopy(PUBLIC_1) + config_mock.return_value = ('file.yaml', copy.deepcopy(CLOUD_2)) + vendor_mock.return_value = ('file.yaml', copy.deepcopy(PUBLIC_1)) _shell = make_shell() # Test command option overriding config file value @@ -690,8 +690,8 @@ class TestShellCliEnv(TestShell): @mock.patch("os_client_config.config.OpenStackConfig._load_vendor_file") @mock.patch("os_client_config.config.OpenStackConfig._load_config_file") def test_shell_args_precedence_1(self, config_mock, vendor_mock): - config_mock.return_value = copy.deepcopy(CLOUD_2) - vendor_mock.return_value = copy.deepcopy(PUBLIC_1) + config_mock.return_value = ('file.yaml', copy.deepcopy(CLOUD_2)) + vendor_mock.return_value = ('file.yaml', copy.deepcopy(PUBLIC_1)) _shell = make_shell() # Test env var @@ -731,8 +731,8 @@ class TestShellCliEnv(TestShell): @mock.patch("os_client_config.config.OpenStackConfig._load_vendor_file") @mock.patch("os_client_config.config.OpenStackConfig._load_config_file") def test_shell_args_precedence_2(self, config_mock, vendor_mock): - config_mock.return_value = copy.deepcopy(CLOUD_2) - vendor_mock.return_value = copy.deepcopy(PUBLIC_1) + config_mock.return_value = ('file.yaml', copy.deepcopy(CLOUD_2)) + vendor_mock.return_value = ('file.yaml', copy.deepcopy(PUBLIC_1)) _shell = make_shell() # Test command option overriding config file value |