openstack
/
python-octaviaclient
Code Issues Proposed changes

Remove mocking of functools.partial 

This, along with the usage of unittest.mock, is breaking
the python3.8 unit test jobs.  Just remove it as we're
really not losing much in test verification.

Change-Id: I5fbcc56f32f824cb52895a3f42e5a4dabe209ac2
This commit is contained in:
Brian Haley 2020-05-05 17:23:15 -04:00
parent ec5b1f5b6e
commit 9c424086e4
2 changed files with 6 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
octaviaclient/tests/unit/osc/v2/test_l7rule.py
View File

@ -88,10 +88,9 @@ class TestL7RuleDelete(TestL7Rule):
l7policy_id=self._l7po.id
)
@mock.patch('functools.partial')
@mock.patch('osc_lib.utils.wait_for_delete')
@mock.patch('octaviaclient.osc.v2.utils.get_l7rule_attrs')
def test_l7rule_delete_wait(self, mock_attrs, mock_wait, mock_partial):
def test_l7rule_delete_wait(self, mock_attrs, mock_wait):
mock_attrs.return_value = {
'l7policy_id': self._l7po.id,
'l7rule_id': self._l7ru.id,
@ -109,9 +108,6 @@ class TestL7RuleDelete(TestL7Rule):
l7rule_id=self._l7ru.id,
l7policy_id=self._l7po.id
)
mock_partial.assert_called_once_with(
self.api_mock.l7rule_show, self._l7po.id
)
mock_wait.assert_called_once_with(
manager=mock.ANY,
res_id=self._l7ru.id,
@ -260,10 +256,9 @@ class TestL7RuleSet(TestL7Rule):
l7policy_id=self._l7po.id,
json={'rule': {'admin_state_up': False}})
@mock.patch('functools.partial')
@mock.patch('osc_lib.utils.wait_for_status')
@mock.patch('octaviaclient.osc.v2.utils.get_l7rule_attrs')
def test_l7rule_set_wait(self, mock_attrs, mock_wait, mock_partial):
def test_l7rule_set_wait(self, mock_attrs, mock_wait):
mock_attrs.return_value = {
'admin_state_up': False,
'l7policy_id': self._l7po.id,
@ -288,9 +283,6 @@ class TestL7RuleSet(TestL7Rule):
l7rule_id=self._l7ru.id,
l7policy_id=self._l7po.id,
json={'rule': {'admin_state_up': False}})
mock_partial.assert_called_once_with(
self.api_mock.l7rule_show, self._l7po.id
)
mock_wait.assert_called_once_with(
status_f=mock.ANY,
res_id=self._l7ru.id,
@ -329,9 +321,8 @@ class TestL7RuleUnset(TestL7Rule):
self.api_mock.l7rule_set.assert_called_once_with(
l7policy_id=self._l7po.id, l7rule_id=self._l7ru.id, json=ref_body)
@mock.patch('functools.partial')
@mock.patch('osc_lib.utils.wait_for_status')
def _test_l7rule_unset_param_wait(self, param, mock_wait, mock_partial):
def _test_l7rule_unset_param_wait(self, param, mock_wait):
self.api_mock.l7rule_set.reset_mock()
arg_param = param.replace('_', '-') if '_' in param else param
arglist = [self._l7po.id, self._l7ru.id, '--%s' % arg_param, '--wait']
@ -347,9 +338,6 @@ class TestL7RuleUnset(TestL7Rule):
self.cmd.take_action(parsed_args)
self.api_mock.l7rule_set.assert_called_once_with(
l7policy_id=self._l7po.id, l7rule_id=self._l7ru.id, json=ref_body)
mock_partial.assert_called_once_with(
self.api_mock.l7rule_show, self._l7po.id
)
mock_wait.assert_called_once_with(
status_f=mock.ANY,
res_id=self._l7ru.id,

18
octaviaclient/tests/unit/osc/v2/test_member.py
View File

@ -173,10 +173,9 @@ class TestMemberDelete(TestMember):
self.api_mock.member_delete.assert_called_with(
pool_id=self._mem.pool_id, member_id=self._mem.id)
@mock.patch('functools.partial')
@mock.patch('osc_lib.utils.wait_for_delete')
@mock.patch('octaviaclient.osc.v2.utils.get_member_attrs')
def test_member_delete_wait(self, mock_attrs, mock_wait, mock_partial):
def test_member_delete_wait(self, mock_attrs, mock_wait):
mock_attrs.return_value = {'pool_id': self._mem.pool_id,
'member_id': self._mem.id}
arglist = [self._mem.pool_id, self._mem.id, '--wait']
@ -190,9 +189,6 @@ class TestMemberDelete(TestMember):
self.cmd.take_action(parsed_args)
self.api_mock.member_delete.assert_called_with(
pool_id=self._mem.pool_id, member_id=self._mem.id)
mock_partial.assert_called_once_with(
self.api_mock.member_show, self._mem.pool_id
)
mock_wait.assert_called_once_with(
manager=mock.ANY,
res_id=self._mem.id,
@ -228,10 +224,9 @@ class TestMemberSet(TestMember):
json={'member': {'name': 'new_name',
'backup': True}})
@mock.patch('functools.partial')
@mock.patch('osc_lib.utils.wait_for_status')
@mock.patch('octaviaclient.osc.v2.utils.get_member_attrs')
def test_member_set_wait(self, mock_attrs, mock_wait, mock_partial):
def test_member_set_wait(self, mock_attrs, mock_wait):
mock_attrs.return_value = {'pool_id': self._mem.pool_id,
'member_id': self._mem.id,
'name': 'new_name'}
@ -249,9 +244,6 @@ class TestMemberSet(TestMember):
self.api_mock.member_set.assert_called_with(
pool_id=self._mem.pool_id, member_id=self._mem.id,
json={'member': {'name': 'new_name'}})
mock_partial.assert_called_once_with(
self.api_mock.member_show, self._mem.pool_id
)
mock_wait.assert_called_once_with(
status_f=mock.ANY,
res_id=self._mem.id,
@ -329,9 +321,8 @@ class TestMemberUnset(TestMember):
self.api_mock.member_set.assert_called_once_with(
pool_id=self._mem.pool_id, member_id=self._mem.id, json=ref_body)
@mock.patch('functools.partial')
@mock.patch('osc_lib.utils.wait_for_status')
def _test_member_unset_param_wait(self, param, mock_wait, mock_partial):
def _test_member_unset_param_wait(self, param, mock_wait):
self.api_mock.member_set.reset_mock()
arg_param = param.replace('_', '-') if '_' in param else param
arglist = [self._mem.pool_id, self._mem.id, '--%s' % arg_param,
@ -348,9 +339,6 @@ class TestMemberUnset(TestMember):
self.cmd.take_action(parsed_args)
self.api_mock.member_set.assert_called_once_with(
pool_id=self._mem.pool_id, member_id=self._mem.id, json=ref_body)
mock_partial.assert_called_once_with(
self.api_mock.member_show, self._mem.pool_id
)
mock_wait.assert_called_once_with(
status_f=mock.ANY,
res_id=self._mem.id,