openstack
/
neutron
Code Issues Proposed changes

tests: remove self.db_obj from objects tests 

This attribute duplicates self.db_objs[0], no need to store it
separately. Keeping it as is just makes it harder to write code that
need to modify the db_objs values used in some tests.

Change-Id: Ib552ef9844a3bbd4966a7b097e6ed346720e2f6b
This commit is contained in:
Ihar Hrachyshka 2016-08-29 10:51:02 +00:00
parent 3cd0ebe934
commit e4a2ebc0a7
4 changed files with 22 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
neutron/tests/unit/objects/qos/test_policy.py
View File

@ -91,7 +91,7 @@ class QosPolicyObjectTestCase(test_base.BaseObjectIfaceTestCase):
with mock.patch.object(
db_api, 'get_objects',
return_value=[self.db_obj]) as get_objects_mock:
return_value=[self.db_objs[0]]) as get_objects_mock:
with mock.patch.object(
self.context,
@ -109,8 +109,9 @@ class QosPolicyObjectTestCase(test_base.BaseObjectIfaceTestCase):
def test_get_object(self):
admin_context = self.context.elevated()
with mock.patch.object(db_api, 'get_object',
return_value=self.db_obj) as get_object_mock:
with mock.patch.object(
db_api, 'get_object',
return_value=self.db_objs[0]) as get_object_mock:
with mock.patch.object(self.context,
'elevated',
return_value=admin_context) as context_mock:
@ -221,13 +222,13 @@ class QosPolicyDbObjectTestCase(test_base.BaseDbObjectTestCase,
def test_attach_network_nonexistent_policy(self):
policy_obj = policy.QosPolicy(self.context, **self.db_obj)
policy_obj = policy.QosPolicy(self.context, **self.db_objs[0])
self.assertRaises(n_exc.NetworkQosBindingNotFound,
policy_obj.attach_network, self._network['id'])
def test_attach_port_nonexistent_policy(self):
policy_obj = policy.QosPolicy(self.context, **self.db_obj)
policy_obj = policy.QosPolicy(self.context, **self.db_objs[0])
self.assertRaises(n_exc.PortQosBindingNotFound,
policy_obj.attach_port, self._port['id'])
@ -308,12 +309,12 @@ class QosPolicyDbObjectTestCase(test_base.BaseDbObjectTestCase,
obj.detach_network, 'non-existent-port')
def test_detach_port_nonexistent_policy(self):
policy_obj = policy.QosPolicy(self.context, **self.db_obj)
policy_obj = policy.QosPolicy(self.context, **self.db_objs[0])
self.assertRaises(n_exc.PortQosBindingNotFound,
policy_obj.detach_port, self._port['id'])
def test_detach_network_nonexistent_policy(self):
policy_obj = policy.QosPolicy(self.context, **self.db_obj)
policy_obj = policy.QosPolicy(self.context, **self.db_objs[0])
self.assertRaises(n_exc.NetworkQosBindingNotFound,
policy_obj.detach_network, self._network['id'])
@ -351,7 +352,7 @@ class QosPolicyDbObjectTestCase(test_base.BaseDbObjectTestCase,
self.assertEqual(rule_dict, obj_dict['rules'][0])
def test_shared_default(self):
obj = self._test_class(self.context, **self.db_obj)
obj = self._test_class(self.context, **self.db_objs[0])
self.assertFalse(obj.shared)
def test_delete_not_allowed_if_policy_in_use_by_port(self):

2
neutron/tests/unit/objects/qos/test_rule.py
View File

@ -69,7 +69,7 @@ class QosBandwidthLimitRuleObjectTestCase(test_base.BaseObjectIfaceTestCase):
_test_class = rule.QosBandwidthLimitRule
def test_to_dict_returns_type(self):
obj = rule.QosBandwidthLimitRule(self.context, **self.db_obj)
obj = rule.QosBandwidthLimitRule(self.context, **self.db_objs[0])
dict_ = obj.to_dict()
self.assertEqual(qos_consts.RULE_TYPE_BANDWIDTH_LIMIT, dict_['type'])

16
neutron/tests/unit/objects/test_base.py
View File

@ -432,7 +432,6 @@ class _BaseObjectTestCase(object):
self._test_class.db_model(**self.get_random_fields())
for _ in range(3)
]
self.db_obj = self.db_objs[0]
# TODO(ihrachys) remove obj_fields since they duplicate self.objs
self.obj_fields = [self._test_class.modify_fields_from_db(db_obj)
@ -515,8 +514,9 @@ class BaseObjectIfaceTestCase(_BaseObjectTestCase, test_base.BaseTestCase):
# TODO(ihrachys) document the intent of all common test cases in docstrings
def test_get_object(self):
with mock.patch.object(obj_db_api, 'get_object',
return_value=self.db_obj) as get_object_mock:
with mock.patch.object(
obj_db_api, 'get_object',
return_value=self.db_objs[0]) as get_object_mock:
with mock.patch.object(obj_db_api, 'get_objects',
side_effect=self.fake_get_objects):
obj_keys = self.generate_object_keys(self._test_class)
@ -551,7 +551,7 @@ class BaseObjectIfaceTestCase(_BaseObjectTestCase, test_base.BaseTestCase):
for unique_keys in self._test_class.unique_keys:
with mock.patch.object(obj_db_api, 'get_object',
return_value=self.db_obj) \
return_value=self.db_objs[0]) \
as get_object_mock:
with mock.patch.object(obj_db_api, 'get_objects',
side_effect=self.fake_get_objects):
@ -666,7 +666,7 @@ class BaseObjectIfaceTestCase(_BaseObjectTestCase, test_base.BaseTestCase):
def test_create(self):
with mock.patch.object(obj_db_api, 'create_object',
return_value=self.db_obj) as create_mock:
return_value=self.db_objs[0]) as create_mock:
with mock.patch.object(obj_db_api, 'get_objects',
side_effect=self.fake_get_objects):
obj = self._test_class(self.context, **self.obj_fields[0])
@ -680,7 +680,7 @@ class BaseObjectIfaceTestCase(_BaseObjectTestCase, test_base.BaseTestCase):
def test_create_updates_from_db_object(self):
with mock.patch.object(obj_db_api, 'create_object',
return_value=self.db_obj):
return_value=self.db_objs[0]):
with mock.patch.object(obj_db_api, 'get_objects',
side_effect=self.fake_get_objects):
self.objs[1].create()
@ -758,7 +758,7 @@ class BaseObjectIfaceTestCase(_BaseObjectTestCase, test_base.BaseTestCase):
@mock.patch.object(obj_db_api, 'update_object')
def test_update_changes(self, update_mock):
fields_to_update = self.get_updatable_fields(
self._test_class.modify_fields_from_db(self.db_obj))
self._test_class.modify_fields_from_db(self.db_objs[0]))
if not fields_to_update:
self.skipTest('No updatable fields found in test class %r' %
self._test_class)
@ -795,7 +795,7 @@ class BaseObjectIfaceTestCase(_BaseObjectTestCase, test_base.BaseTestCase):
def test_update_updates_from_db_object(self):
with mock.patch.object(obj_db_api, 'update_object',
return_value=self.db_obj):
return_value=self.db_objs[0]):
with mock.patch.object(obj_db_api, 'get_objects',
side_effect=self.fake_get_objects):
obj = self._test_class(self.context, **self.obj_fields[1])

8
neutron/tests/unit/objects/test_trunk.py
View File

@ -118,8 +118,8 @@ class TrunkDbObjectTestCase(test_base.BaseDbObjectTestCase,
return trunk
def test_create_with_sub_ports(self):
trunk = self._test_create_trunk_with_subports(self.db_obj['port_id'],
[1, 2])
trunk = self._test_create_trunk_with_subports(
self.db_objs[0]['port_id'], [1, 2])
def _as_tuple(sub_port):
return (sub_port['port_id'],
@ -134,7 +134,7 @@ class TrunkDbObjectTestCase(test_base.BaseDbObjectTestCase,
def test_get_object_includes_correct_subports(self):
trunk1_vids = [1, 2, 3]
trunk2_vids = [4, 5, 6]
port_id1 = self.db_obj['port_id']
port_id1 = self.db_objs[0]['port_id']
trunk1 = self._test_create_trunk_with_subports(port_id1, trunk1_vids)
port_id2 = uuidutils.generate_uuid()
@ -155,7 +155,7 @@ class TrunkDbObjectTestCase(test_base.BaseDbObjectTestCase,
def test_update_multiple_fields(self):
trunk = t_obj.Trunk(context=self.context,
admin_state_up=False,
port_id=self.db_obj['port_id'],
port_id=self.db_objs[0]['port_id'],
status=constants.DOWN_STATUS)
trunk.create()
fields = {'admin_state_up': True, 'status': constants.ACTIVE_STATUS}