diff options
| author | Zhongyue Luo <lzyeval@gmail.com> | 2012-06-03 16:36:06 +0800 |
|---|---|---|
| committer | Zhongyue Luo <lzyeval@gmail.com> | 2012-06-07 09:24:03 +0800 |
| commit | 3dce38f32559659978dd2ae69e9ffcb39c608582 (patch) | |
| tree | 7735a91c738dbd944344eb4fa3724bc9aa4dcf4b /nova/tests/api/openstack/compute/contrib/test_server_diagnostics.py | |
| parent | 7b7febb02b37420c759eab59b07c7e3e2de9bab1 (diff) | |
| download | nova-3dce38f32559659978dd2ae69e9ffcb39c608582.tar.gz nova-3dce38f32559659978dd2ae69e9ffcb39c608582.tar.xz nova-3dce38f32559659978dd2ae69e9ffcb39c608582.zip | |
Replace standard json module with openstack.common.jsonutils
Implements blueprint use-common-jsonutils
1. Edit openstack-common.conf and import nova/openstack/common/jsonutils.py
2. Remove json package imports and replace with jsonutils
Places where using json.load hasn't changed.
Change-Id: Ie6feab605fb0474fd505c56ef57b7a9ecfa5269d
Diffstat (limited to 'nova/tests/api/openstack/compute/contrib/test_server_diagnostics.py')
| -rw-r--r-- | nova/tests/api/openstack/compute/contrib/test_server_diagnostics.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/nova/tests/api/openstack/compute/contrib/test_server_diagnostics.py b/nova/tests/api/openstack/compute/contrib/test_server_diagnostics.py index f7ec4543b..cea04d39e 100644 --- a/nova/tests/api/openstack/compute/contrib/test_server_diagnostics.py +++ b/nova/tests/api/openstack/compute/contrib/test_server_diagnostics.py @@ -13,7 +13,6 @@ # License for the specific language governing permissions and limitations # under the License. -import json import unittest from lxml import etree @@ -22,6 +21,7 @@ from nova.api.openstack import compute from nova.api.openstack.compute.contrib import server_diagnostics from nova.api.openstack import wsgi import nova.compute +from nova.openstack.common import jsonutils from nova import test from nova.tests.api.openstack import fakes import nova.utils @@ -54,7 +54,7 @@ class ServerDiagnosticsTest(test.TestCase): def test_get_diagnostics(self): req = fakes.HTTPRequest.blank('/fake/servers/%s/diagnostics' % UUID) res = req.get_response(self.router) - output = json.loads(res.body) + output = jsonutils.loads(res.body) self.assertEqual(output, {'data': 'Some diagnostic info'}) |