diff options
| author | Jenkins <jenkins@review.openstack.org> | 2017-06-30 10:12:37 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2017-06-30 10:12:37 +0000 |
| commit | 343fe299bf637762f8da680d7d7b5f6117b1661b (patch) | |
| tree | 1f1929a4a454e24dfec0168ca2e1e1ffa6c746ee | |
| parent | cffca4e29e373e3f09f2ffdd458761183a851569 (diff) | |
| parent | 2e4a06604297d5b0164c52101bdde17581d361f1 (diff) | |
| download | osprofiler-343fe299bf637762f8da680d7d7b5f6117b1661b.tar.gz | |
Merge "Improve error reporting for Ceilometer driver"1.10.1
| -rw-r--r-- | osprofiler/drivers/ceilometer.py | 3 | ||||
| -rw-r--r-- | osprofiler/tests/unit/cmd/test_shell.py | 7 |
2 files changed, 3 insertions, 7 deletions
diff --git a/osprofiler/drivers/ceilometer.py b/osprofiler/drivers/ceilometer.py index 746934f..fb6bd95 100644 --- a/osprofiler/drivers/ceilometer.py +++ b/osprofiler/drivers/ceilometer.py @@ -36,8 +36,7 @@ class Ceilometer(base.Driver): if hasattr(e, "http_status") and e.http_status == 401: msg = "Invalid OpenStack Identity credentials." else: - msg = ("Something has gone wrong. See ceilometer logs " - "for more details") + msg = "Error occurred while connecting to Ceilometer: %s." % e raise exc.CommandError(msg) @classmethod diff --git a/osprofiler/tests/unit/cmd/test_shell.py b/osprofiler/tests/unit/cmd/test_shell.py index 1121c24..20293ea 100644 --- a/osprofiler/tests/unit/cmd/test_shell.py +++ b/osprofiler/tests/unit/cmd/test_shell.py @@ -145,11 +145,8 @@ class ShellTestCase(test.TestCase): self._test_with_command_error(self._trace_show_cmd(), msg) def test_trace_show_unknown_error(self): - class FakeException(Exception): - pass - - self.ceiloclient.client.get_client.side_effect = FakeException - msg = "Something has gone wrong. See ceilometer logs for more details" + self.ceiloclient.client.get_client.side_effect = Exception("test") + msg = "Error occurred while connecting to Ceilometer: test." self._test_with_command_error(self._trace_show_cmd(), msg) @mock.patch("osprofiler.drivers.ceilometer.Ceilometer.get_report") |