summaryrefslogtreecommitdiff
path: root/openstackclient/tests/compute
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-06-20 17:26:57 +0000
committerGerrit Code Review <review@openstack.org>2016-06-20 17:26:57 +0000
commitf5ae23ab86c662e2f75952e6aa62c02ab3855b9b (patch)
tree5bee5786f26c329c7dee8847cebc9d11ece1a04f /openstackclient/tests/compute
parenta99b54ef758477376a6254face4ff7fcc698dd8f (diff)
parent047cb6849354f4fdf8d365bd109a0ed56a77d200 (diff)
downloadpython-openstackclient-f5ae23ab86c662e2f75952e6aa62c02ab3855b9b.tar.gz
Merge "Standardize logger usage"
Diffstat (limited to 'openstackclient/tests/compute')
-rw-r--r--openstackclient/tests/compute/v2/test_service.py15
1 files changed, 6 insertions, 9 deletions
diff --git a/openstackclient/tests/compute/v2/test_service.py b/openstackclient/tests/compute/v2/test_service.py
index b360c9dc..3afe964f 100644
--- a/openstackclient/tests/compute/v2/test_service.py
+++ b/openstackclient/tests/compute/v2/test_service.py
@@ -330,12 +330,9 @@ class TestServiceSet(TestService):
]
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
- with mock.patch.object(self.cmd.log, 'error') as mock_log:
- with mock.patch.object(self.service_mock, 'enable',
- side_effect=Exception()):
- self.assertRaises(exceptions.CommandError,
- self.cmd.take_action, parsed_args)
- mock_log.assert_called_once_with(
- "Failed to set service status to %s", "enabled")
- self.service_mock.force_down.assert_called_once_with(
- self.service.host, self.service.binary, force_down=True)
+ with mock.patch.object(self.service_mock, 'enable',
+ side_effect=Exception()):
+ self.assertRaises(exceptions.CommandError,
+ self.cmd.take_action, parsed_args)
+ self.service_mock.force_down.assert_called_once_with(
+ self.service.host, self.service.binary, force_down=True)