← Back to branch summary

~ubuntu-branches/ubuntu/raring/nova/raring-proposed

« back to all changes in this revision

Viewing changes to nova/tests/api/openstack/compute/test_urlmap.py

  • Committer: Package Import Robot
  • Author(s): Chuck Short, Adam Gandelman, Chuck Short
  • Date: 2012-11-23 09:04:58 UTC
  • mfrom: (1.1.66)
  • Revision ID: package-import@ubuntu.com-20121123090458-91565o7aev1i1h71
Tags: 2013.1~g1-0ubuntu1
https://launchpad.net/bugs/1073289
https://launchpad.net/bugs/1076442
[ Adam Gandelman ]
* debian/control: Ensure novaclient is upgraded with nova,
  require python-keystoneclient >= 1:2.9.0. (LP: #1073289)
* debian/patches/{ubuntu/*, rbd-security.patch}: Dropped, applied
  upstream.
* debian/control: Add python-testtools to Build-Depends.

[ Chuck Short ]
* New upstream version.
* Refreshed debian/patches/avoid_setuptools_git_dependency.patch.
* debian/rules: FTBFS if missing binaries.
* debian/nova-scheudler.install: Add missing rabbit-queues and
  nova-rpc-zmq-receiver.
* Remove nova-volume since it doesnt exist anymore, transition to cinder-*.
* debian/rules: install apport hook in the right place.
* debian/patches/ubuntu-show-tests.patch: Display test failures.
* debian/control: Add depends on genisoimage
* debian/control: Suggest guestmount.
* debian/control: Suggest websockify. (LP: #1076442)
* debian/nova.conf: Disable nova-volume service.
* debian/control: Depend on xen-system-* rather than the hypervisor.
* debian/control, debian/mans/nova-conductor.8, debian/nova-conductor.init,
  debian/nova-conductor.install, debian/nova-conductor.logrotate
  debian/nova-conductor.manpages, debian/nova-conductor.postrm
  debian/nova-conductor.upstart.in: Add nova-conductor service.
* debian/control: Add python-fixtures as a build deps.

Show diffs side-by-side

added added

removed removed

Lines of Context:
nova/tests/api/openstack/compute/test_urlmap.py
38
38
        """Test URL path specifying v1.1 returns v2 content."""
39
39
        req = webob.Request.blank('/v1.1/')
40
40
        req.accept = "application/json"
41
 
        res = req.get_response(fakes.wsgi_app())
 
41
        res = req.get_response(fakes.wsgi_app(init_only=('versions',)))
42
42
        self.assertEqual(res.status_int, 200)
43
43
        self.assertEqual(res.content_type, "application/json")
44
44
        body = jsonutils.loads(res.body)
49
49
        req = webob.Request.blank('/')
50
50
        req.content_type = "application/json;version=1.1"
51
51
        req.accept = "application/json"
52
 
        res = req.get_response(fakes.wsgi_app())
 
52
        res = req.get_response(fakes.wsgi_app(init_only=('versions',)))
53
53
        self.assertEqual(res.status_int, 200)
54
54
        self.assertEqual(res.content_type, "application/json")
55
55
        body = jsonutils.loads(res.body)
59
59
        """Test Accept header specifying v1.1 returns v2 content."""
60
60
        req = webob.Request.blank('/')
61
61
        req.accept = "application/json;version=1.1"
62
 
        res = req.get_response(fakes.wsgi_app())
 
62
        res = req.get_response(fakes.wsgi_app(init_only=('versions',)))
63
63
        self.assertEqual(res.status_int, 200)
64
64
        self.assertEqual(res.content_type, "application/json")
65
65
        body = jsonutils.loads(res.body)
69
69
        """Test URL path specifying v2 returns v2 content."""
70
70
        req = webob.Request.blank('/v2/')
71
71
        req.accept = "application/json"
72
 
        res = req.get_response(fakes.wsgi_app())
 
72
        res = req.get_response(fakes.wsgi_app(init_only=('versions',)))
73
73
        self.assertEqual(res.status_int, 200)
74
74
        self.assertEqual(res.content_type, "application/json")
75
75
        body = jsonutils.loads(res.body)
80
80
        req = webob.Request.blank('/')
81
81
        req.content_type = "application/json;version=2"
82
82
        req.accept = "application/json"
83
 
        res = req.get_response(fakes.wsgi_app())
 
83
        res = req.get_response(fakes.wsgi_app(init_only=('versions',)))
84
84
        self.assertEqual(res.status_int, 200)
85
85
        self.assertEqual(res.content_type, "application/json")
86
86
        body = jsonutils.loads(res.body)
90
90
        """Test Accept header specifying v2 returns v2 content."""
91
91
        req = webob.Request.blank('/')
92
92
        req.accept = "application/json;version=2"
93
 
        res = req.get_response(fakes.wsgi_app())
 
93
        res = req.get_response(fakes.wsgi_app(init_only=('versions',)))
94
94
        self.assertEqual(res.status_int, 200)
95
95
        self.assertEqual(res.content_type, "application/json")
96
96
        body = jsonutils.loads(res.body)
101
101
        url = '/v2/fake/images/cedef40a-ed67-4d10-800e-17455edce175.json'
102
102
        req = webob.Request.blank(url)
103
103
        req.accept = "application/xml"
104
 
        res = req.get_response(fakes.wsgi_app())
 
104
        res = req.get_response(fakes.wsgi_app(init_only=('images',)))
105
105
        self.assertEqual(res.status_int, 200)
106
106
        self.assertEqual(res.content_type, "application/json")
107
107
        body = jsonutils.loads(res.body)
113
113
        url = '/v2/fake/images/cedef40a-ed67-4d10-800e-17455edce175'
114
114
        req = webob.Request.blank(url)
115
115
        req.accept = "application/xml;q=0.8, application/json"
116
 
        res = req.get_response(fakes.wsgi_app())
 
116
        res = req.get_response(fakes.wsgi_app(init_only=('images',)))
117
117
        self.assertEqual(res.status_int, 200)
118
118
        self.assertEqual(res.content_type, "application/json")
119
119
        body = jsonutils.loads(res.body)