Merge "Use the correct OCCI version"

This commit is contained in:
Jenkins 2017-04-12 10:29:37 +00:00 committed by Gerrit Code Review
commit f6b3c5a5a6
2 changed files with 4 additions and 4 deletions

View File

@ -34,7 +34,7 @@ class TestMiddleware(base.TestCase):
self.accept = self.content_type = None
self.application_url = fakes.application_url
self.occi_string = "OCCI/1.1"
self.occi_string = "OCCI/1.2"
def get_app(self, resp=None):
return wsgi.OCCIMiddleware(fakes.FakeApp())
@ -109,7 +109,7 @@ class TestMiddleware(base.TestCase):
def test_good_user_agent(self):
req = self._build_req("/", "tenant")
req.user_agent = "foo OCCI/1.1 bar"
req.user_agent = "foo OCCI/1.2 bar"
result = req.get_response(self.get_app())
self.assertEqual(404, result.status_code)
self.assertDefaults(result)
@ -123,7 +123,7 @@ class TestMiddleware(base.TestCase):
def test_ugly_user_agent(self):
req = self._build_req("/", "tenant")
req.user_agent = "fooOCCI/1.1bar"
req.user_agent = "fooOCCI/1.2bar"
result = req.get_response(self.get_app())
self.assertEqual(404, result.status_code)
self.assertDefaults(result)

View File

@ -110,7 +110,7 @@ class Request(webob.Request):
class OCCIMiddleware(object):
occi_version = "1.1"
occi_version = "1.2"
occi_string = "OCCI/%s" % occi_version
@classmethod