fix request mock object due to change in oslo.policy

oslo.policy got patched Ia74bf6c40b1e05a1c958f4325e00f68be28d91b9
to validate received creds object, this uncovered a bug in
of mock_req.env being not mock-ed correctly while being accessed
in policy.py file

Change-Id: I2586122a4a64e747076dc4e472e82805b4106488
This commit is contained in:
Sumit Jamgade 2018-08-20 14:47:22 +02:00
parent 85b8aeea0f
commit 2c2e604a2a
6 changed files with 13 additions and 13 deletions

View File

@ -30,7 +30,7 @@ class TestActionsCollectionResource(common.FreezerBaseTestCase):
super(TestActionsCollectionResource, self).setUp()
self.mock_db = mock.Mock()
self.mock_req = mock.MagicMock()
self.mock_req.__getitem__.side_effect = common.get_req_items
self.mock_req.env.__getitem__.side_effect = common.get_req_items
self.mock_req.get_header.return_value = common.fake_action_0['user_id']
self.mock_req.status = falcon.HTTP_200
self.resource = v1_actions.ActionsCollectionResource(self.mock_db)
@ -77,7 +77,7 @@ class TestActionsResource(common.FreezerBaseTestCase):
super(TestActionsResource, self).setUp()
self.mock_db = mock.Mock()
self.mock_req = mock.MagicMock()
self.mock_req.__getitem__.side_effect = common.get_req_items
self.mock_req.env.__getitem__.side_effect = common.get_req_items
self.mock_req.get_header.return_value = common.fake_action_0['user_id']
self.mock_req.status = falcon.HTTP_200
self.resource = v1_actions.ActionsResource(self.mock_db)

View File

@ -29,7 +29,7 @@ class TestBackupsCollectionResource(common.FreezerBaseTestCase):
super(TestBackupsCollectionResource, self).setUp()
self.mock_db = mock.Mock()
self.mock_req = mock.MagicMock()
self.mock_req.__getitem__.side_effect = common.get_req_items
self.mock_req.env.__getitem__.side_effect = common.get_req_items
self.mock_req.get_header.return_value = {
'X-User-ID': common.fake_data_0_user_id}
self.mock_req.status = falcon.HTTP_200
@ -79,7 +79,7 @@ class TestBackupsResource(common.FreezerBaseTestCase):
super(TestBackupsResource, self).setUp()
self.mock_db = mock.Mock()
self.mock_req = mock.MagicMock()
self.mock_req.__getitem__.side_effect = common.get_req_items
self.mock_req.env.__getitem__.side_effect = common.get_req_items
self.mock_req.get_header.return_value = {
'X-User-ID': common.fake_data_0_user_id}
self.mock_req.status = falcon.HTTP_200

View File

@ -25,7 +25,7 @@ class TestClientsCollectionResource(common.FreezerBaseTestCase):
super(TestClientsCollectionResource, self).setUp()
self.mock_db = mock.Mock()
self.mock_req = mock.MagicMock()
self.mock_req.__getitem__.side_effect = common.get_req_items
self.mock_req.env.__getitem__.side_effect = common.get_req_items
self.mock_req.get_header.return_value = common.fake_data_0_user_id
self.mock_req.status = falcon.HTTP_200
self.resource = v1_clients.ClientsCollectionResource(self.mock_db)
@ -72,7 +72,7 @@ class TestClientsResource(common.FreezerBaseTestCase):
super(TestClientsResource, self).setUp()
self.mock_db = mock.Mock()
self.mock_req = mock.MagicMock()
self.mock_req.__getitem__.side_effect = common.get_req_items
self.mock_req.env.__getitem__.side_effect = common.get_req_items
self.mock_req.get_header.return_value = common.fake_data_0_user_id
self.mock_req.status = falcon.HTTP_200
self.resource = v1_clients.ClientsResource(self.mock_db)

View File

@ -27,7 +27,7 @@ class TestExceptions(unittest.TestCase):
self.ex = mock.Mock()
self.ex.message = 'test exception'
self.mock_req = mock.MagicMock()
self.mock_req.__getitem__.side_effect = common.get_req_items
self.mock_req.env.__getitem__.side_effect = common.get_req_items
self.mock_req.context = {}
def test_FreezerAPIException(self):

View File

@ -136,7 +136,7 @@ class TestJobsCollectionResource(common.FreezerBaseTestCase):
self.mock_json_body.return_value = {}
self.mock_db = mock.Mock()
self.mock_req = mock.MagicMock()
self.mock_req.__getitem__.side_effect = common.get_req_items
self.mock_req.env.__getitem__.side_effect = common.get_req_items
self.mock_req.get_header.return_value = common.fake_job_0_user_id
self.mock_req.status = falcon.HTTP_200
self.resource = v1_jobs.JobsCollectionResource(self.mock_db)
@ -175,7 +175,7 @@ class TestJobsResource(common.FreezerBaseTestCase):
super(TestJobsResource, self).setUp()
self.mock_db = mock.Mock()
self.mock_req = mock.MagicMock()
self.mock_req.__getitem__.side_effect = common.get_req_items
self.mock_req.env.__getitem__.side_effect = common.get_req_items
self.mock_req.stream.read.return_value = {}
self.mock_req.get_header.return_value = common.fake_job_0_user_id
self.mock_req.status = falcon.HTTP_200
@ -257,7 +257,7 @@ class TestJobsEvent(common.FreezerBaseTestCase):
super(TestJobsEvent, self).setUp()
self.mock_db = mock.Mock()
self.mock_req = mock.MagicMock()
self.mock_req.__getitem__.side_effect = common.get_req_items
self.mock_req.env.__getitem__.side_effect = common.get_req_items
self.mock_req.get_header.return_value = common.fake_session_0[
'user_id']
self.mock_req.status = falcon.HTTP_200

View File

@ -31,7 +31,7 @@ class TestSessionsCollectionResource(common.FreezerBaseTestCase):
super(TestSessionsCollectionResource, self).setUp()
self.mock_db = mock.Mock()
self.mock_req = mock.MagicMock()
self.mock_req.__getitem__.side_effect = common.get_req_items
self.mock_req.env.__getitem__.side_effect = common.get_req_items
self.mock_req.get_header.return_value = common.fake_session_0[
'user_id']
self.mock_req.status = falcon.HTTP_200
@ -164,7 +164,7 @@ class TestSessionsAction(common.FreezerBaseTestCase):
super(TestSessionsAction, self).setUp()
self.mock_db = mock.Mock()
self.mock_req = mock.MagicMock()
self.mock_req.__getitem__.side_effect = common.get_req_items
self.mock_req.env.__getitem__.side_effect = common.get_req_items
self.mock_req.get_header.return_value = common.fake_session_0[
'user_id']
self.mock_req.status = falcon.HTTP_200
@ -378,7 +378,7 @@ class TestSessionsJobs(common.FreezerBaseTestCase):
super(TestSessionsJobs, self).setUp()
self.mock_db = mock.Mock()
self.mock_req = mock.MagicMock()
self.mock_req.__getitem__.side_effect = common.get_req_items
self.mock_req.env.__getitem__.side_effect = common.get_req_items
self.mock_req.get_header.return_value = common.fake_session_0[
'user_id']
self.mock_req.status = falcon.HTTP_200