Remove duplicated code in test_versions
There is duplicated code in test_versions. This patch removes it for cleanup. Change-Id: Id8ff2147e624a89476a65c3f0ded54bdb26e53ad
This commit is contained in:
parent
e1f5d3c54b
commit
3668c7b66a
@ -120,9 +120,11 @@ class VersionsTest(test.NoDBTestCase):
|
||||
redirect_req = webob.Request.blank('/v2/')
|
||||
self.assertEqual(res.location, redirect_req.url)
|
||||
|
||||
def test_get_version_2_detail(self):
|
||||
req = webob.Request.blank('/v2/')
|
||||
req.accept = "application/json"
|
||||
def _test_get_version_2_detail(self, url, accept=None):
|
||||
if accept is None:
|
||||
accept = "application/json"
|
||||
req = webob.Request.blank(url)
|
||||
req.accept = accept
|
||||
res = req.get_response(fakes.wsgi_app())
|
||||
self.assertEqual(res.status_int, 200)
|
||||
self.assertEqual(res.content_type, "application/json")
|
||||
@ -159,44 +161,12 @@ class VersionsTest(test.NoDBTestCase):
|
||||
}
|
||||
self.assertEqual(expected, version)
|
||||
|
||||
def test_get_version_2_detail(self):
|
||||
self._test_get_version_2_detail('/v2/')
|
||||
|
||||
def test_get_version_2_detail_content_type(self):
|
||||
req = webob.Request.blank('/')
|
||||
req.accept = "application/json;version=2"
|
||||
res = req.get_response(fakes.wsgi_app())
|
||||
self.assertEqual(res.status_int, 200)
|
||||
self.assertEqual(res.content_type, "application/json")
|
||||
version = jsonutils.loads(res.body)
|
||||
expected = {
|
||||
"version": {
|
||||
"id": "v2.0",
|
||||
"status": "CURRENT",
|
||||
"updated": "2011-01-21T11:33:21Z",
|
||||
"links": [
|
||||
{
|
||||
"rel": "self",
|
||||
"href": "http://localhost/v2/",
|
||||
},
|
||||
{
|
||||
"rel": "describedby",
|
||||
"type": "text/html",
|
||||
"href": EXP_LINKS['v2.0']['html'],
|
||||
},
|
||||
],
|
||||
"media-types": [
|
||||
{
|
||||
"base": "application/xml",
|
||||
"type": "application/"
|
||||
"vnd.openstack.compute+xml;version=2",
|
||||
},
|
||||
{
|
||||
"base": "application/json",
|
||||
"type": "application/"
|
||||
"vnd.openstack.compute+json;version=2",
|
||||
},
|
||||
],
|
||||
},
|
||||
}
|
||||
self.assertEqual(expected, version)
|
||||
accept = "application/json;version=2"
|
||||
self._test_get_version_2_detail('/', accept=accept)
|
||||
|
||||
def test_get_version_2_detail_xml(self):
|
||||
req = webob.Request.blank('/v2/')
|
||||
|
Loading…
Reference in New Issue
Block a user