From 6cf4ea74fc74defc8f50497ffdcf8e89dafb2782 Mon Sep 17 00:00:00 2001 From: Bo Chen Date: Wed, 31 Aug 2022 11:30:41 -0700 Subject: [PATCH] tests: live-migration: Cleanup ovs-dpdk setup correctly on failures As 'handle_child_output()' may terminate the test on panic, we need to cleanup ovs-dpdk setup in advance. see: #4555 Signed-off-by: Bo Chen --- tests/integration.rs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tests/integration.rs b/tests/integration.rs index da432cd7a..56be687fa 100644 --- a/tests/integration.rs +++ b/tests/integration.rs @@ -8871,11 +8871,12 @@ mod live_migration { let _ = dest_child.kill(); let _ = ovs_child.kill(); let dest_output = dest_child.wait_with_output().unwrap(); - handle_child_output(r, &dest_output); let ovs_output = ovs_child.wait_with_output().unwrap(); - handle_child_output(Ok(()), &ovs_output); cleanup_ovs_dpdk(); + + handle_child_output(r, &dest_output); + handle_child_output(Ok(()), &ovs_output); } mod live_migration_parallel {