openstack/python-ceilometerclient
Code Issues Proposed changes

Merge "cleanup aodh mocks"

Browse Source
This commit is contained in:
Jenkins
2017-01-23 10:56:40 +00:00
committed by Gerrit Code Review
parent 089cb912a2 45f4f9584b
commit 909032dac3
1 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
ceilometerclient/tests/unit/test_shell.py
View File

@@ -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']