Do not assume order of security group rules
This fixes the unit tests[1] that breaks with a randomized PYTHONHASHSEED (see the bug report). The test assumed that the security_group_rules_for_devices method from neutron.agent.securitygroups_rpc returned security group rules in a particular order. Found with PYTHONHASHSEED=2. The fix refactors the test case to handle unsorted security group rules. [1] neutron.tests.unit.plugins.ml2.test_security_group.\ TestMl2SGServerRpcCallBack.\ test_security_group_rules_for_devices_ipv4_ingress_addr_pair Partial-bug: #1348818 Note: There are several other unrelated unit tests that also break with a randomized PYTHONHASHSEED, but they are not addressed here. They will be addressed in separate patches. Change-Id: I1b2bd4100c19004f12822c414aefc86aae9849db
This commit is contained in:
parent
7de7df280b
commit
36a1d14b58
@ -36,6 +36,7 @@ from neutron.extensions import securitygroup as ext_sg
|
|||||||
from neutron import manager
|
from neutron import manager
|
||||||
from neutron.plugins.openvswitch.agent import ovs_neutron_agent
|
from neutron.plugins.openvswitch.agent import ovs_neutron_agent
|
||||||
from neutron.tests import base
|
from neutron.tests import base
|
||||||
|
from neutron.tests import tools
|
||||||
from neutron.tests.unit.extensions import test_securitygroup as test_sg
|
from neutron.tests.unit.extensions import test_securitygroup as test_sg
|
||||||
|
|
||||||
FAKE_PREFIX = {const.IPv4: '10.0.0.0/24',
|
FAKE_PREFIX = {const.IPv4: '10.0.0.0/24',
|
||||||
@ -321,6 +322,7 @@ class SGServerRpcCallBackTestCase(test_sg.SecurityGroupDBTestCase):
|
|||||||
'port_range_min': 23,
|
'port_range_min': 23,
|
||||||
'source_ip_prefix': fake_prefix},
|
'source_ip_prefix': fake_prefix},
|
||||||
]
|
]
|
||||||
|
expected = tools.UnorderedList(expected)
|
||||||
self.assertEqual(expected,
|
self.assertEqual(expected,
|
||||||
port_rpc['security_group_rules'])
|
port_rpc['security_group_rules'])
|
||||||
self.assertEqual(port['port']['allowed_address_pairs'],
|
self.assertEqual(port['port']['allowed_address_pairs'],
|
||||||
|
Loading…
Reference in New Issue
Block a user