diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-11-22 13:56:11 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-11-22 13:56:11 +0000 |
| commit | b8cc160fb76c72b922a4394de8c5e70f5e8ea7b4 (patch) | |
| tree | ba2e57c8a8a98a76dfebc04349da67e8a5797b9b | |
| parent | 5232a6bdc89241ccfb9e7b7782372911c3e86442 (diff) | |
| parent | 90ada0eb5486878b5f12346d92872537de53109a (diff) | |
| download | oslo-b8cc160fb76c72b922a4394de8c5e70f5e8ea7b4.tar.gz oslo-b8cc160fb76c72b922a4394de8c5e70f5e8ea7b4.tar.xz oslo-b8cc160fb76c72b922a4394de8c5e70f5e8ea7b4.zip | |
Merge "update deprecated stanza"
| -rw-r--r-- | openstack/common/log.py | 2 | ||||
| -rw-r--r-- | tests/unit/test_deprecated.py | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/openstack/common/log.py b/openstack/common/log.py index 319c6e2..8469fe8 100644 --- a/openstack/common/log.py +++ b/openstack/common/log.py @@ -174,7 +174,7 @@ class ContextAdapter(logging.LoggerAdapter): self.log(logging.AUDIT, msg, *args, **kwargs) def deprecated(self, msg, *args, **kwargs): - stdmsg = _("Deprecated Config: %s") % msg + stdmsg = _("Deprecated: %s") % msg if CONF.fatal_deprecations: self.critical(stdmsg, *args, **kwargs) raise DeprecatedConfig(msg=stdmsg) diff --git a/tests/unit/test_deprecated.py b/tests/unit/test_deprecated.py index 770a7b9..5c85fd9 100644 --- a/tests/unit/test_deprecated.py +++ b/tests/unit/test_deprecated.py @@ -38,16 +38,16 @@ class DeprecatedConfigTestCase(test_utils.BaseTestCase): def test_deprecated(self): LOG.deprecated('test') - self.assertEqual(self.warnbuffer, 'Deprecated Config: test') + self.assertEqual(self.warnbuffer, 'Deprecated: test') def test_deprecated_fatal(self): self.config(fatal_deprecations=True) self.assertRaises(logging.DeprecatedConfig, LOG.deprecated, "test2") - self.assertEqual(self.critbuffer, 'Deprecated Config: test2') + self.assertEqual(self.critbuffer, 'Deprecated: test2') def test_deprecated_logs_only_once(self): LOG.deprecated('only once!') LOG.deprecated('only once!') LOG.deprecated('only once!') - self.assertEqual(self.warnbuffer, 'Deprecated Config: only once!') + self.assertEqual(self.warnbuffer, 'Deprecated: only once!') |