Skip to content

Commit 5229b35

Browse files
committed
fix test cleanup: ignore deletion errors and propagate panics properly
Replace assert-based cleanup with straightforward deletion calls and explicit panic propagation via resume_unwind. This ensures that cleanup failures don't mask test results, and panicked tests properly unwind through the cleanup code. Signed-off-by: Gris Ge <cnfourt@gmail.com>
1 parent f58ebb9 commit 5229b35

6 files changed

Lines changed: 24 additions & 6 deletions

File tree

src/ip/link/tests/bond.rs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,5 +84,8 @@ where
8484
// clean up
8585
exec_cmd(&["ip", "link", "del", dummy_name]);
8686
exec_cmd(&["ip", "link", "del", bond_name]);
87-
assert!(result.is_ok())
87+
88+
if let Err(e) = result {
89+
std::panic::resume_unwind(e);
90+
}
8891
}

src/ip/link/tests/bridge.rs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -198,5 +198,8 @@ where
198198
// clean up
199199
exec_cmd(&["ip", "link", "del", dummy_name]);
200200
exec_cmd(&["ip", "link", "del", br_name]);
201-
assert!(result.is_ok())
201+
202+
if let Err(e) = result {
203+
std::panic::resume_unwind(e);
204+
}
202205
}

src/ip/link/tests/dummy.rs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,5 +76,8 @@ where
7676

7777
// clean up
7878
exec_cmd(&["ip", "link", "del", name]);
79-
assert!(result.is_ok())
79+
80+
if let Err(e) = result {
81+
std::panic::resume_unwind(e);
82+
}
8083
}

src/ip/link/tests/nlmon.rs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,5 +68,8 @@ where
6868

6969
// clean up
7070
exec_cmd(&["ip", "link", "del", name]);
71-
assert!(result.is_ok())
71+
72+
if let Err(e) = result {
73+
std::panic::resume_unwind(e);
74+
}
7275
}

src/ip/link/tests/vlan.rs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -283,5 +283,8 @@ where
283283
// clean up
284284
exec_cmd(&["ip", "link", "del", vlan_name]);
285285
exec_cmd(&["ip", "link", "del", &parent_name]);
286-
assert!(result.is_ok())
286+
287+
if let Err(e) = result {
288+
std::panic::resume_unwind(e);
289+
}
287290
}

src/ip/link/tests/vxlan.rs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,5 +67,8 @@ where
6767

6868
// clean up
6969
exec_cmd(&["ip", "link", "del", vxlan_name]);
70-
assert!(result.is_ok())
70+
71+
if let Err(e) = result {
72+
std::panic::resume_unwind(e);
73+
}
7174
}

0 commit comments

Comments
 (0)