diff options
| author | Jenkins <jenkins@review.openstack.org> | 2017-01-23 10:56:40 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2017-01-23 10:56:40 +0000 |
| commit | 909032dac3c74e451d2b56c8d9ca161cfd487b4b (patch) | |
| tree | 2ec8ac90af0dc4a04d0b823abbf0ad17fb85f4bb | |
| parent | 089cb912a2e95cb658adec9e2e90d3a5574bd1cb (diff) | |
| parent | 45f4f9584bb46e1d7f47d32ac9cfaab04a209d34 (diff) | |
| download | python-ceilometerclient-909032dac3c74e451d2b56c8d9ca161cfd487b4b.tar.gz | |
Merge "cleanup aodh mocks"
| -rw-r--r-- | ceilometerclient/tests/unit/test_shell.py | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/ceilometerclient/tests/unit/test_shell.py b/ceilometerclient/tests/unit/test_shell.py index ab94fe0..41f6f54 100644 --- a/ceilometerclient/tests/unit/test_shell.py +++ b/ceilometerclient/tests/unit/test_shell.py @@ -113,8 +113,8 @@ class ShellKeystoneV2Test(ShellTestBase): @mock.patch.object(ks_session, 'Session') @mock.patch('ceilometerclient.v2.client.Client._get_alarm_client', - return_value=None) - def test_debug_switch_raises_error(self, get_alarm_client, mock_ksclient): + mock.Mock(return_value=None)) + def test_debug_switch_raises_error(self, mock_ksclient): mock_ksclient.side_effect = exc.HTTPUnauthorized self.make_env(FAKE_V2_ENV) args = ['--debug', 'event-list'] @@ -122,8 +122,8 @@ class ShellKeystoneV2Test(ShellTestBase): @mock.patch.object(ks_session, 'Session') @mock.patch('ceilometerclient.v2.client.Client._get_alarm_client', - return_value=None) - def test_dash_d_switch_raises_error(self, get_alarm_client, mock_ksclient): + mock.Mock(return_value=None)) + def test_dash_d_switch_raises_error(self, mock_ksclient): mock_ksclient.side_effect = exc.CommandError("FAIL") self.make_env(FAKE_V2_ENV) args = ['-d', 'event-list'] @@ -142,8 +142,8 @@ class ShellKeystoneV3Test(ShellTestBase): @mock.patch.object(ks_session, 'Session') @mock.patch('ceilometerclient.v2.client.Client._get_alarm_client', - return_value=None) - def test_debug_switch_raises_error(self, get_alarm_client, mock_ksclient): + mock.Mock(return_value=None)) + def test_debug_switch_raises_error(self, mock_ksclient): mock_ksclient.side_effect = exc.HTTPUnauthorized self.make_env(FAKE_V3_ENV) args = ['--debug', 'event-list'] @@ -195,8 +195,8 @@ class ShellTimeoutTest(ShellTestBase): @mock.patch.object(ks_session, 'Session') @mock.patch('ceilometerclient.v2.client.Client._get_alarm_client', - return_value=None) - def test_timeout_keystone_session(self, get_alarm_client, mocked_session): + mock.Mock(return_value=None)) + def test_timeout_keystone_session(self, mocked_session): mocked_session.side_effect = exc.HTTPUnauthorized("FAIL") self.make_env(FAKE_V2_ENV) args = ['--debug', '--timeout', '5', 'alarm-list'] @@ -209,8 +209,8 @@ class ShellInsecureTest(ShellTestBase): @mock.patch.object(api_client, 'HTTPClient') @mock.patch('ceilometerclient.v2.client.Client._get_alarm_client', - return_value=None) - def test_insecure_true_ceilometer(self, get_alarm_client, mocked_client): + mock.Mock(return_value=None)) + def test_insecure_true_ceilometer(self, mocked_client): self.make_env(FAKE_V2_ENV) args = ['--debug', '--os-insecure', 'true', 'alarm-list'] self.assertIsNone(ceilometer_shell.main(args)) @@ -219,8 +219,8 @@ class ShellInsecureTest(ShellTestBase): @mock.patch.object(ks_session, 'Session') @mock.patch('ceilometerclient.v2.client.Client._get_alarm_client', - return_value=None) - def test_insecure_true_keystone(self, get_alarm_client, mocked_session): + mock.Mock(return_value=None)) + def test_insecure_true_keystone(self, mocked_session): mocked_session.side_effect = exc.HTTPUnauthorized("FAIL") self.make_env(FAKE_V2_ENV) args = ['--debug', '--os-insecure', 'true', 'alarm-list'] @@ -230,8 +230,8 @@ class ShellInsecureTest(ShellTestBase): @mock.patch.object(api_client, 'HTTPClient') @mock.patch('ceilometerclient.v2.client.Client._get_alarm_client', - return_value=None) - def test_insecure_false_ceilometer(self, get_alarm_client, mocked_client): + mock.Mock(return_value=None)) + def test_insecure_false_ceilometer(self, mocked_client): self.make_env(FAKE_V2_ENV) args = ['--debug', '--os-insecure', 'false', 'alarm-list'] self.assertIsNone(ceilometer_shell.main(args)) @@ -240,8 +240,8 @@ class ShellInsecureTest(ShellTestBase): @mock.patch.object(ks_session, 'Session') @mock.patch('ceilometerclient.v2.client.Client._get_alarm_client', - return_value=None) - def test_insecure_false_keystone(self, get_alarm_client, mocked_session): + mock.Mock(return_value=None)) + def test_insecure_false_keystone(self, mocked_session): mocked_session.side_effect = exc.HTTPUnauthorized("FAIL") self.make_env(FAKE_V2_ENV) args = ['--debug', '--os-insecure', 'false', 'alarm-list'] |