← 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_extended_server_attributes.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_extended_server_attributes.py
13
13
#    License for the specific language governing permissions and limitations
14
14
#    under the License.
15
15
 
16
 
import json
17
 
 
18
16
from lxml import etree
19
17
import webob
20
18
 
22
20
from nova import compute
23
21
from nova import exception
24
22
from nova import flags
 
23
from nova.openstack.common import jsonutils
25
24
from nova import test
26
25
from nova.tests.api.openstack import fakes
27
26
 
62
61
        return res
63
62
 
64
63
    def _get_server(self, body):
65
 
        return json.loads(body).get('server')
 
64
        return jsonutils.loads(body).get('server')
66
65
 
67
66
    def _get_servers(self, body):
68
 
        return json.loads(body).get('servers')
 
67
        return jsonutils.loads(body).get('servers')
69
68
 
70
69
    def assertServerAttributes(self, server, host, instance_name):
71
70
        self.assertEqual(server.get('%shost' % self.prefix), host)