Merge "Use HTTPRequest instead of HTTPRequestV3 for v2/v2.1 tests"

This commit is contained in:
Jenkins 2014-11-27 04:17:36 +00:00 committed by Gerrit Code Review
commit b40ea7c0ec

View File

@ -48,7 +48,7 @@ class ShelvePolicyTestV21(test.NoDBTestCase):
self.controller = self.plugin.ShelveController()
def _fake_request(self):
return fakes.HTTPRequestV3.blank('/servers/12/os-shelve')
return fakes.HTTPRequest.blank('/v2/123/servers/12/os-shelve')
def test_shelve_restricted_by_role(self):
rules = {'compute_extension:%sshelve' % self.prefix:
@ -143,6 +143,3 @@ class ShelvePolicyTestV2(ShelvePolicyTestV21):
plugin = shelve_v2
prefix = ''
offload = 'shelveOffload'
def _fake_request(self):
return fakes.HTTPRequest.blank('/v2/123/servers/12/os-shelve')