diff options
| author | Andrew Bogott <abogott@wikimedia.org> | 2012-07-03 00:16:36 -0500 |
|---|---|---|
| committer | Andrew Bogott <abogott@wikimedia.org> | 2012-07-03 00:48:52 -0500 |
| commit | 85f6662f25e9d2696ec6086a1423c1b93a58cb0c (patch) | |
| tree | 6ffafa3ec536a70aa76267dead8891f5406fc4dc /tests/unit/test_log.py | |
| parent | 506486550480fb222a92447e1e8baca855d126aa (diff) | |
| download | oslo-85f6662f25e9d2696ec6086a1423c1b93a58cb0c.tar.gz oslo-85f6662f25e9d2696ec6086a1423c1b93a58cb0c.tar.xz oslo-85f6662f25e9d2696ec6086a1423c1b93a58cb0c.zip | |
Switch common files to using jsonutils.
For blueprint use-common-jsonutils
Pretty much just a search and replace.
Change-Id: I66f63e7b0ff82a37d8a6b9acef94f4e10a45bf90
Diffstat (limited to 'tests/unit/test_log.py')
| -rw-r--r-- | tests/unit/test_log.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/unit/test_log.py b/tests/unit/test_log.py index f417db5..8eaffca 100644 --- a/tests/unit/test_log.py +++ b/tests/unit/test_log.py @@ -1,10 +1,10 @@ import cStringIO -import json import logging import sys from openstack.common import context from openstack.common import cfg +from openstack.common import jsonutils from openstack.common import log from openstack.common.notifier import api as notifier from openstack.common.notifier import list_notifier @@ -144,7 +144,7 @@ class JSONFormatterTestCase(test_utils.BaseTestCase): test_data = {'test': 'log'} self.log.debug(test_msg, test_data) - data = json.loads(self.stream.getvalue()) + data = jsonutils.loads(self.stream.getvalue()) self.assertTrue(data) self.assertTrue('extra' in data) self.assertEqual('test-json', data['name']) @@ -168,7 +168,7 @@ class JSONFormatterTestCase(test_utils.BaseTestCase): except Exception: self.log.exception(test_msg, test_data) - data = json.loads(self.stream.getvalue()) + data = jsonutils.loads(self.stream.getvalue()) self.assertTrue(data) self.assertTrue('extra' in data) self.assertEqual('test-json', data['name']) |