[DNM] Fix mocks in EC2 token tests
Updated mocks used in ec2_token tests according to the changes made by [1] [1] https://review.opendev.org/c/openstack/keystonemiddleware/+/878023 Change-Id: I83f67ce5309c2d7909fab53dc7f5f8fd37158f15
This commit is contained in:
parent
654d31a1bd
commit
7b72bf581d
|
@ -72,7 +72,7 @@ class EC2TokenMiddlewareTestBase(utils.TestCase):
|
|||
|
||||
class EC2TokenMiddlewareTestGood(EC2TokenMiddlewareTestBase):
|
||||
@mock.patch.object(
|
||||
requests, 'request',
|
||||
requests, 'post',
|
||||
return_value=FakeResponse(EMPTY_RESPONSE, status_code=200))
|
||||
def test_protocol_old_versions(self, mock_request):
|
||||
req = webob.Request.blank('/test')
|
||||
|
@ -84,9 +84,9 @@ class EC2TokenMiddlewareTestGood(EC2TokenMiddlewareTestBase):
|
|||
self.assertEqual(TOKEN_ID, req.headers['X-Auth-Token'])
|
||||
|
||||
mock_request.assert_called_with(
|
||||
'POST', 'http://localhost:5000/v3/ec2tokens',
|
||||
'http://localhost:5000/v3/ec2tokens',
|
||||
data=mock.ANY, headers={'Content-Type': 'application/json'},
|
||||
verify=True, cert=None)
|
||||
verify=True, cert=None, timeout=mock.ANY)
|
||||
|
||||
data = jsonutils.loads(mock_request.call_args[1]['data'])
|
||||
expected_data = {
|
||||
|
@ -103,7 +103,7 @@ class EC2TokenMiddlewareTestGood(EC2TokenMiddlewareTestBase):
|
|||
self.assertDictEqual(expected_data, data)
|
||||
|
||||
@mock.patch.object(
|
||||
requests, 'request',
|
||||
requests, 'post',
|
||||
return_value=FakeResponse(EMPTY_RESPONSE, status_code=200))
|
||||
def test_protocol_v4(self, mock_request):
|
||||
req = webob.Request.blank('/test')
|
||||
|
@ -119,9 +119,9 @@ class EC2TokenMiddlewareTestGood(EC2TokenMiddlewareTestBase):
|
|||
self.assertEqual(TOKEN_ID, req.headers['X-Auth-Token'])
|
||||
|
||||
mock_request.assert_called_with(
|
||||
'POST', 'http://localhost:5000/v3/ec2tokens',
|
||||
'http://localhost:5000/v3/ec2tokens',
|
||||
data=mock.ANY, headers={'Content-Type': 'application/json'},
|
||||
verify=True, cert=None)
|
||||
verify=True, cert=None, timeout=mock.ANY)
|
||||
|
||||
data = jsonutils.loads(mock_request.call_args[1]['data'])
|
||||
expected_data = {
|
||||
|
@ -154,7 +154,7 @@ class EC2TokenMiddlewareTestBad(EC2TokenMiddlewareTestBase):
|
|||
self._validate_ec2_error(resp, 400, 'AuthFailure')
|
||||
|
||||
@mock.patch.object(requests,
|
||||
'request',
|
||||
'post',
|
||||
return_value=FakeResponse(EMPTY_RESPONSE))
|
||||
def test_communication_failure(self, mock_request):
|
||||
req = webob.Request.blank('/test')
|
||||
|
@ -162,12 +162,13 @@ class EC2TokenMiddlewareTestBad(EC2TokenMiddlewareTestBase):
|
|||
req.GET['AWSAccessKeyId'] = 'test-key-id'
|
||||
resp = req.get_response(self.middleware)
|
||||
self._validate_ec2_error(resp, 400, 'AuthFailure')
|
||||
mock_request.assert_called_with('POST', mock.ANY,
|
||||
mock_request.assert_called_with(mock.ANY,
|
||||
data=mock.ANY, headers=mock.ANY,
|
||||
verify=mock.ANY, cert=mock.ANY)
|
||||
verify=mock.ANY, cert=mock.ANY,
|
||||
timeout=mock.ANY)
|
||||
|
||||
@mock.patch.object(requests,
|
||||
'request',
|
||||
'post',
|
||||
return_value=FakeResponse(EMPTY_RESPONSE))
|
||||
def test_no_result_data(self, mock_request):
|
||||
req = webob.Request.blank('/test')
|
||||
|
@ -175,6 +176,7 @@ class EC2TokenMiddlewareTestBad(EC2TokenMiddlewareTestBase):
|
|||
req.GET['AWSAccessKeyId'] = 'test-key-id'
|
||||
resp = req.get_response(self.middleware)
|
||||
self._validate_ec2_error(resp, 400, 'AuthFailure')
|
||||
mock_request.assert_called_with('POST', mock.ANY,
|
||||
mock_request.assert_called_with(mock.ANY,
|
||||
data=mock.ANY, headers=mock.ANY,
|
||||
verify=mock.ANY, cert=mock.ANY)
|
||||
verify=mock.ANY, cert=mock.ANY,
|
||||
timeout=mock.ANY)
|
||||
|
|
Loading…
Reference in New Issue