Merge "Correct spelling errors in test_quota_classes"

This commit is contained in:
Zuul 2019-11-06 04:54:39 +00:00 committed by Gerrit Code Review
commit dabd25fc36
4 changed files with 23 additions and 23 deletions

View File

@ -162,17 +162,17 @@ class PlanApiTest(base.TestCase):
@mock.patch(
'karbor.api.v1.plans.PlansController._get_all')
def test_plan_list_detail(self, moak_get_all):
def test_plan_list_detail(self, mock_get_all):
req = fakes.HTTPRequest.blank('/v1/plans')
self.controller.index(req)
self.assertTrue(moak_get_all.called)
self.assertTrue(mock_get_all.called)
@mock.patch(
'karbor.api.v1.plans.PlansController._get_all')
def test_plan_index_limit_offset(self, moak_get_all):
def test_plan_index_limit_offset(self, mock_get_all):
req = fakes.HTTPRequest.blank('/v1/plans?limit=2&offset=1')
self.controller.index(req)
self.assertTrue(moak_get_all.called)
self.assertTrue(mock_get_all.called)
req = fakes.HTTPRequest.blank('/v1/plans?limit=-1&offset=1')
self.assertRaises(exc.HTTPBadRequest,
@ -201,10 +201,10 @@ class PlanApiTest(base.TestCase):
@mock.patch(
'karbor.api.v1.plans.PlansController._plan_get')
def test_plan_show(self, moak_plan_get):
def test_plan_show(self, mock_plan_get):
req = fakes.HTTPRequest.blank('/v1/plans')
self.controller.show(req, '2a9ce1f3-cc1a-4516-9435-0ebb13caa398')
self.assertTrue(moak_plan_get.called)
self.assertTrue(mock_plan_get.called)
def test_plan_show_Invalid(self):
req = fakes.HTTPRequest.blank('/v1/plans/1')
@ -220,10 +220,10 @@ class PlanApiTest(base.TestCase):
@mock.patch(
'karbor.api.v1.plans.PlansController._plan_get')
def test_plan_delete(self, moak_plan_get):
def test_plan_delete(self, mock_plan_get):
req = fakes.HTTPRequest.blank('/v1/plans')
self.controller.delete(req, '2a9ce1f3-cc1a-4516-9435-0ebb13caa398')
self.assertTrue(moak_plan_get.called)
self.assertTrue(mock_plan_get.called)
def test_plan_delete_Invalid(self):
req = fakes.HTTPRequest.blank('/v1/plans/1')

View File

@ -33,17 +33,17 @@ class ProvidersApiTest(base.TestCase):
@mock.patch(
'karbor.api.v1.providers.ProvidersController._get_all')
def test_providers_list_detail(self, moak_get_all):
def test_providers_list_detail(self, mock_get_all):
req = fakes.HTTPRequest.blank('/v1/providers')
self.controller.index(req)
self.assertTrue(moak_get_all.called)
self.assertTrue(mock_get_all.called)
@mock.patch(
'karbor.services.protection.api.API.show_provider')
def test_providers_show(self, moak_show_provider):
def test_providers_show(self, mock_show_provider):
req = fakes.HTTPRequest.blank('/v1/providers')
self.controller.show(req, '2220f8b1-975d-4621-a872-fa9afb43cb6c')
self.assertTrue(moak_show_provider.called)
self.assertTrue(mock_show_provider.called)
def test_providers_show_Invalid(self):
req = fakes.HTTPRequest.blank('/v1/providers')
@ -71,10 +71,10 @@ class ProvidersApiTest(base.TestCase):
@mock.patch(
'karbor.services.protection.api.API.'
'show_checkpoint')
def test_checkpoint_show_Invalid(self, moak_show_checkpoint):
def test_checkpoint_show_Invalid(self, mock_show_checkpoint):
req = fakes.HTTPRequest.blank('/v1/providers/'
'{provider_id}/checkpoints/')
moak_show_checkpoint.return_value = {
mock_show_checkpoint.return_value = {
"provider_id": "efc6a88b-9096-4bb6-8634-cda182a6e12a",
"project_id": "446a04d8-6ff5-4e0e-99a4-827a6389e9ff",
"id": "2220f8b1-975d-4621-a872-fa9afb43cb6c"
@ -86,10 +86,10 @@ class ProvidersApiTest(base.TestCase):
@mock.patch(
'karbor.services.protection.api.API.'
'list_checkpoints')
def test_checkpoint_index(self, moak_list_checkpoints):
def test_checkpoint_index(self, mock_list_checkpoints):
req = fakes.HTTPRequest.blank('/v1/providers/'
'{provider_id}/checkpoints/')
moak_list_checkpoints.return_value = [
mock_list_checkpoints.return_value = [
{
"provider_id": "efc6a88b-9096-4bb6-8634-cda182a6e12a",
"project_id": "446a04d8-6ff5-4e0e-99a4-827a6389e9ff",
@ -99,7 +99,7 @@ class ProvidersApiTest(base.TestCase):
self.controller.checkpoints_index(
req,
'2220f8b1-975d-4621-a872-fa9afb43cb6c')
self.assertTrue(moak_list_checkpoints.called)
self.assertTrue(mock_list_checkpoints.called)
@mock.patch('karbor.quota.QuotaEngine.commit')
@mock.patch('karbor.quota.QuotaEngine.reserve')

View File

@ -42,13 +42,13 @@ class QuotaClassApiTest(base.TestCase):
@mock.patch(
'karbor.quota.DbQuotaDriver.get_class_quotas')
def test_quota_show(self, moak_quota_get):
def test_quota_show(self, mock_quota_get):
req = fakes.HTTPRequest.blank(
'/v1/quota_classes/73f74f90a1754bd7ad658afb3272323f',
use_admin_context=True)
self.controller.show(
req, '73f74f90a1754bd7ad658afb3272323f')
self.assertTrue(moak_quota_get.called)
self.assertTrue(mock_quota_get.called)
def _quota_in_request_body(self):
quota_req = {

View File

@ -87,10 +87,10 @@ class RestoreApiTest(base.TestCase):
@mock.patch(
'karbor.api.v1.restores.RestoresController._get_all')
def test_restore_list_detail(self, moak_get_all):
def test_restore_list_detail(self, mock_get_all):
req = fakes.HTTPRequest.blank('/v1/restores')
self.controller.index(req)
self.assertTrue(moak_get_all.called)
self.assertTrue(mock_get_all.called)
@mock.patch(
'karbor.api.v1.restores.RestoresController._get_all')
@ -119,11 +119,11 @@ class RestoreApiTest(base.TestCase):
@mock.patch(
'karbor.api.v1.restores.RestoresController.'
'_restore_get')
def test_restore_show(self, moak_restore_get):
def test_restore_show(self, mock_restore_get):
req = fakes.HTTPRequest.blank('/v1/restores')
self.controller.show(
req, '2a9ce1f3-cc1a-4516-9435-0ebb13caa398')
self.assertTrue(moak_restore_get.called)
self.assertTrue(mock_restore_get.called)
def test_restore_show_Invalid(self):
req = fakes.HTTPRequest.blank('/v1/restores/1')