diff options
| author | Jenkins <jenkins@review.openstack.org> | 2017-06-05 03:48:27 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2017-06-05 03:48:27 +0000 |
| commit | 34ecde516605cc2f0dfa7051ccbd8f338de0554e (patch) | |
| tree | 0596f47e49fc9a63346130852c9ed4da7c3c95ec | |
| parent | 2f3c93dc372017f5559ffe9450fcb856d64e1c07 (diff) | |
| parent | 14d2f881036b7555d3a0d8fe2a8c59d9e99b5f95 (diff) | |
| download | oslo-log-34ecde516605cc2f0dfa7051ccbd8f338de0554e.tar.gz | |
Merge "formatter: skip ImportError when adding error_summary"3.28.0
| -rw-r--r-- | oslo_log/formatters.py | 2 | ||||
| -rw-r--r-- | oslo_log/tests/unit/test_log.py | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/oslo_log/formatters.py b/oslo_log/formatters.py index 6195deb..2f9f979 100644 --- a/oslo_log/formatters.py +++ b/oslo_log/formatters.py @@ -119,7 +119,7 @@ def _get_error_summary(record): if not exc_info[0]: exc_info = None elif exc_info[0] in (TypeError, ValueError, - KeyError, AttributeError): + KeyError, AttributeError, ImportError): # NOTE(dhellmann): Do not include information about # common built-in exceptions used to detect cases of # bad or missing data. We don't use isinstance() here diff --git a/oslo_log/tests/unit/test_log.py b/oslo_log/tests/unit/test_log.py index 1df8a02..a946d9e 100644 --- a/oslo_log/tests/unit/test_log.py +++ b/oslo_log/tests/unit/test_log.py @@ -702,7 +702,10 @@ class ContextFormatterTestCase(LogTestBase): ctxt = _fake_context() ctxt.request_id = six.text_type('99') message = self.trans_fixture.lazy('test ' + six.unichr(128)) - for ignore in [ValueError, TypeError, KeyError, AttributeError]: + ignored_exceptions = [ + ValueError, TypeError, KeyError, AttributeError, ImportError + ] + for ignore in ignored_exceptions: try: raise ignore('test_exception_logging') except ignore as e: |