diff options
| author | Jenkins <jenkins@review.openstack.org> | 2014-10-23 20:16:40 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2014-10-23 20:16:40 +0000 |
| commit | a6497a43ec42919e68b4b7eee9745568a35c6637 (patch) | |
| tree | e8f1cdf795ac6ca0c033355e573ffe9a73b99727 | |
| parent | 2eef0dc03d4fd6d7363cdb8fc02c4d5d188c1a88 (diff) | |
| parent | ab0992cf5303752f054ad4d47f0a949aadbea83a (diff) | |
| download | neutron-a6497a43ec42919e68b4b7eee9745568a35c6637.tar.gz | |
Merge "Ensure ofagent unit tests handles random hashseeds"
| -rw-r--r-- | neutron/tests/unit/ofagent/test_ofa_flows.py | 2 | ||||
| -rw-r--r-- | neutron/tests/unit/ofagent/test_ofa_neutron_agent.py | 12 |
2 files changed, 9 insertions, 5 deletions
diff --git a/neutron/tests/unit/ofagent/test_ofa_flows.py b/neutron/tests/unit/ofagent/test_ofa_flows.py index af92f9b492..a733288039 100644 --- a/neutron/tests/unit/ofagent/test_ofa_flows.py +++ b/neutron/tests/unit/ofagent/test_ofa_flows.py @@ -84,7 +84,7 @@ class TestOFAgentFlows(ofa_test_base.OFATestBase): priority=0, table_id=12)), call(ofpp.OFPFlowMod(dp, priority=0, table_id=13)), ] - sendmsg.assert_has_calls(expected_calls) + sendmsg.assert_has_calls(expected_calls, any_order=True) def test_install_arp_responder(self): br = self.br diff --git a/neutron/tests/unit/ofagent/test_ofa_neutron_agent.py b/neutron/tests/unit/ofagent/test_ofa_neutron_agent.py index 638b40120e..32d2721e85 100644 --- a/neutron/tests/unit/ofagent/test_ofa_neutron_agent.py +++ b/neutron/tests/unit/ofagent/test_ofa_neutron_agent.py @@ -662,7 +662,8 @@ class TestOFANeutronAgent(ofa_test_base.OFAAgentTestBase): mock.call(self.agent.local_vlan_map[self.lvms[0].net].vlan, 'ip2', 'mac2') ] - self.ryuapp.add_arp_table_entry.assert_has_calls(calls) + self.ryuapp.add_arp_table_entry.assert_has_calls(calls, + any_order=True) setup_tun_fn.assert_called_once_with(self.agent.int_br, '192.0.2.1', 'gre') @@ -685,7 +686,8 @@ class TestOFANeutronAgent(ofa_test_base.OFAAgentTestBase): mock.call(self.agent.local_vlan_map[self.lvms[0].net].vlan, 'ip2', 'mac2') ] - self.ryuapp.add_arp_table_entry.assert_has_calls(calls) + self.ryuapp.add_arp_table_entry.assert_has_calls(calls, + any_order=True) self.assertFalse(setup_tun_fn.called) def test_add_arp_table_entry_vlan(self): @@ -716,7 +718,8 @@ class TestOFANeutronAgent(ofa_test_base.OFAAgentTestBase): mock.call(self.agent.local_vlan_map[self.lvms[0].net].vlan, 'ip2') ] - self.ryuapp.del_arp_table_entry.assert_has_calls(calls) + self.ryuapp.del_arp_table_entry.assert_has_calls(calls, + any_order=True) cleanup_tun_fn.assert_called_once_with(self.agent.int_br, 1, 'gre') def _test_del_arp_table_entry_non_tunnel(self, network_type): @@ -738,7 +741,8 @@ class TestOFANeutronAgent(ofa_test_base.OFAAgentTestBase): mock.call(self.agent.local_vlan_map[self.lvms[0].net].vlan, 'ip2') ] - self.ryuapp.del_arp_table_entry.assert_has_calls(calls) + self.ryuapp.del_arp_table_entry.assert_has_calls(calls, + any_order=True) self.assertFalse(cleanup_tun_fn.called) def test_del_arp_table_entry_vlan(self): |