← Back to branch summary

~ubuntu-branches/ubuntu/quantal/nova/quantal-security

« back to all changes in this revision

Viewing changes to nova/tests/api/openstack/compute/contrib/test_server_diagnostics.py

  • Committer: Package Import Robot
  • Author(s): Chuck Short, Chuck Short, Adam Gandelman
  • Date: 2012-06-22 12:39:57 UTC
  • mfrom: (1.1.57)
  • Revision ID: package-import@ubuntu.com-20120622123957-hbzwg84nt9rqwg8r
Tags: 2012.2~f2~20120621.14517-0ubuntu1
[ Chuck Short ]
* New upstream version.

[ Adam Gandelman ]
* debian/rules: Temporarily disable test suite while blocking
  tests are investigated. 
* debian/patches/kombu_tests_timeout.patch: Dropped.

Show diffs side-by-side

added added

removed removed

Lines of Context:
nova/tests/api/openstack/compute/contrib/test_server_diagnostics.py
13
13
#    License for the specific language governing permissions and limitations
14
14
#    under the License.
15
15
 
16
 
import json
17
16
import unittest
18
17
 
19
18
from lxml import etree
22
21
from nova.api.openstack.compute.contrib import server_diagnostics
23
22
from nova.api.openstack import wsgi
24
23
import nova.compute
 
24
from nova.openstack.common import jsonutils
25
25
from nova import test
26
26
from nova.tests.api.openstack import fakes
27
27
import nova.utils
54
54
    def test_get_diagnostics(self):
55
55
        req = fakes.HTTPRequest.blank('/fake/servers/%s/diagnostics' % UUID)
56
56
        res = req.get_response(self.router)
57
 
        output = json.loads(res.body)
 
57
        output = jsonutils.loads(res.body)
58
58
        self.assertEqual(output, {'data': 'Some diagnostic info'})
59
59
 
60
60