openstack
/
octavia
Code Issues Proposed changes

Remove the redundant mock patches in tests 

By the way, fix the misspelling of "listener".

Change-Id: I9eb0693a8ffb3605ba863d158677b3a28635944c
This commit is contained in:
Guoqiang Ding 2017-12-20 16:07:42 +08:00
parent 51f6f7258b
commit 8e30761b78
2 changed files with 1 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
octavia/tests/functional/db/test_repositories.py
View File

@ -1634,7 +1634,7 @@ class AllRepositoriesTest(base.OctaviaDBTestBase):
self.session, project_id=project_id).in_use_load_balancer)
conf.config(group='api_settings', auth_strategy=constants.TESTING)
# ### Test listner quota
# ### Test listener quota
# Test decrement on zero in use quota
project_id = uuidutils.generate_uuid()
quota = {'in_use_listener': 0}

8
octavia/tests/unit/controller/worker/tasks/test_database_tasks.py
View File

@ -1388,9 +1388,7 @@ class TestDatabaseTasks(base.TestCase):
HM_ID,
provisioning_status=constants.ERROR)
@mock.patch('octavia.db.repositories.LoadBalancerRepository.update')
def test_update_load_balancer_in_db(self,
mock_listner_repo_update,
mock_generate_uuid,
mock_LOG,
mock_get_session,
@ -1427,11 +1425,9 @@ class TestDatabaseTasks(base.TestCase):
id=LB_ID,
provisioning_status=constants.ERROR)
@mock.patch('octavia.db.repositories.LoadBalancerRepository.update')
@mock.patch('octavia.db.repositories.VipRepository.update')
def test_update_vip_in_db_during_update_loadbalancer(self,
mock_vip_update,
mock_listner_update,
mock_generate_uuid,
mock_LOG,
mock_get_session,
@ -1455,9 +1451,7 @@ class TestDatabaseTasks(base.TestCase):
repo.VipRepository.update.assert_called_once_with('TEST', LB_ID,
qos_policy_id='fool')
@mock.patch('octavia.db.repositories.ListenerRepository.update')
def test_update_listener_in_db(self,
mock_listner_repo_update,
mock_generate_uuid,
mock_LOG,
mock_get_session,
@ -1829,9 +1823,7 @@ class TestDatabaseTasks(base.TestCase):
mock_amp_health_repo_update.assert_called_once_with(
'TEST', amphora_id=AMP_ID, busy=True)
@mock.patch('octavia.db.repositories.LoadBalancerRepository.update')
def test_update_lb_server_group_in_db(self,
mock_listner_repo_update,
mock_generate_uuid,
mock_LOG,
mock_get_session,