openstack
/
dragonflow
Code Issues Proposed changes

Fix VM deleting error in CI 

We delete VM twice which may cause one of them fail

Change-Id: I9e8f6e9e8e3178cbae9c0c9ea2db90e4d52af661
This commit is contained in:
Wang Jian 2016-08-19 15:58:43 +08:00
parent ea8e233d9a
commit e0d34e0e91
6 changed files with 0 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
dragonflow/tests/fullstack/test_l2_multicast.py
View File

@ -88,6 +88,5 @@ class TestL2Multicast(test_base.DFTestBase):
r = self._check_multicast_rule(ovs.dump(self.integration_bridge),
metadataid, tunnel_key_hex)
self.assertIsNotNone(r)
vm.server.stop()
vm.close()
network.close()

1
dragonflow/tests/fullstack/test_ml2_l2_flows.py
View File

@ -83,7 +83,6 @@ class TestL2FLows(test_base.DFTestBase):
tunnel_key_hex,
mac)
self.assertIsNotNone(r)
vm.server.stop()
vm.close()
network.close()

1
dragonflow/tests/fullstack/test_portsec_flows.py
View File

@ -216,7 +216,6 @@ class TestOVSFlowsForPortSecurity(test_base.DFTestBase):
)
self._check_all_flows_existed(expected_flow_list)
vm.server.stop()
vm.close()
time.sleep(utils.DEFAULT_CMD_TIMEOUT)

2
dragonflow/tests/fullstack/test_responder.py
View File

@ -79,7 +79,6 @@ class ArpResponderTest(test_base.DFTestBase):
flows_middle = self._get_arp_table_flows()
vm.server.stop()
vm.close()
eventlet.sleep(test_utils.DEFAULT_CMD_TIMEOUT)
flows_delta = [flow for flow in flows_middle
@ -173,7 +172,6 @@ class ICMPResponderTest(test_base.DFTestBase):
flows_middle = self._get_l2_lookup_table_flows()
vm.server.stop()
vm.close()
router.close()
eventlet.sleep(test_utils.DEFAULT_CMD_TIMEOUT)

2
dragonflow/tests/fullstack/test_sg_flows.py
View File

@ -318,7 +318,6 @@ class TestOVSFlowsForSecurityGroup(test_base.DFTestBase):
self.assertIsNotNone(ingress_associating_flow)
self.assertIsNotNone(egress_associating_flow)
vm.server.stop()
vm.close()
time.sleep(utils.DEFAULT_CMD_TIMEOUT)
@ -387,7 +386,6 @@ class TestOVSFlowsForSecurityGroup(test_base.DFTestBase):
# Check if the rule flows were installed.
self._check_rule_flows(flows_after_change, True)
vm.server.stop()
vm.close()
# We can't guarantee that all rule flows have been deleted because

1
dragonflow/tests/fullstack/test_topology.py
View File

@ -62,7 +62,6 @@ class TestTopology(test_base.DFTestBase):
def _remove_vm(self, vm):
vm_mac = vm.get_first_mac()
vm.server.stop()
vm.close()
wait_until_none(
lambda: 1 if any(self._get_vm_flows(vm_mac)) else None, timeout=60,