From 38f0d8d3ce068ee4c209e28c21f3f6729b85a623 Mon Sep 17 00:00:00 2001 From: "James O. D. Hunt" Date: Thu, 3 Dec 2020 16:24:27 +0000 Subject: [PATCH] config: Fix assert_error testing macro Fixed the `assert_error!()` test macro so that it correctly handles the scenario where the test expects an error, but the actual result was `Ok` (no error). Signed-off-by: James O. D. Hunt --- src/agent/src/config.rs | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/agent/src/config.rs b/src/agent/src/config.rs index c3b311de3..8225eee5f 100644 --- a/src/agent/src/config.rs +++ b/src/agent/src/config.rs @@ -337,12 +337,15 @@ mod tests { assert!(*expected_level == actual_level, $msg); } else { let expected_error = $expected_result.as_ref().unwrap_err(); - let actual_error = $actual_result.unwrap_err(); - let expected_error_msg = format!("{:?}", expected_error); - let actual_error_msg = format!("{:?}", actual_error); - assert!(expected_error_msg == actual_error_msg, $msg); + if let Err(actual_error) = $actual_result { + let actual_error_msg = format!("{:?}", actual_error); + + assert!(expected_error_msg == actual_error_msg, $msg); + } else { + assert!(expected_error_msg == "expected error, got OK", $msg); + } } }; }