From efb6fbffdb96c6acd197b8a7c4fe0ed9855a151e Mon Sep 17 00:00:00 2001 From: Daniel Mueller Date: Wed, 8 Jul 2020 09:16:56 -0700 Subject: Remove unwrap_str_err method from UnwrapError test trait With upcoming changes we intend to move towards a model where we do not distinguish the individual error variants the program deals with in a global enum. In preparation of such a change, this patch marks a first step in removing the UnwrapError test trait, which relies on the existence of exactly such typed errors. In particular, we remove the unwrap_str_err method from it, basically falling back to just working with strings. --- src/tests/config.rs | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'src/tests/config.rs') diff --git a/src/tests/config.rs b/src/tests/config.rs index fa311d5..3542ecf 100644 --- a/src/tests/config.rs +++ b/src/tests/config.rs @@ -55,8 +55,10 @@ $"#, #[test_device] fn set_wrong_usage(model: nitrokey::Model) { - let res = Nitrocli::with_model(model).handle(&["config", "set", "--numlock", "2", "-N"]); - let err = res.unwrap_str_err(); + let err = Nitrocli::with_model(model) + .handle(&["config", "set", "--numlock", "2", "-N"]) + .unwrap_err() + .to_string(); assert!( err.contains("The argument '--numlock ' cannot be used with '--no-numlock'"), err, -- cgit v1.2.1