From 76dfd27ef163f44ef45688bf9d23332c822221dc Mon Sep 17 00:00:00 2001
From: Daniel Mueller <deso@posteo.net>
Date: Thu, 9 Jul 2020 18:57:18 -0700
Subject: Remove unwrap_lib_err method from UnwrapError test trait

This change marks the next step in getting rid of the UnwrapError test
trait. Specifically, it removes its unwrap_lib_err method.
---
 src/tests/otp.rs | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

(limited to 'src/tests/otp.rs')

diff --git a/src/tests/otp.rs b/src/tests/otp.rs
index 837b075..8802d9e 100644
--- a/src/tests/otp.rs
+++ b/src/tests/otp.rs
@@ -33,15 +33,16 @@ fn set_invalid_slot_raw(model: nitrokey::Model) {
 
 #[test_device]
 fn set_invalid_slot(model: nitrokey::Model) {
-  let res = Nitrocli::with_model(model).handle(&["otp", "set", "100", "name", "1234", "-f", "hex"]);
-
-  assert_eq!(
-    res.unwrap_lib_err(),
-    (
-      Some("Could not write OTP slot"),
-      nitrokey::LibraryError::InvalidSlot
-    )
+  let err = Nitrocli::with_model(model)
+    .handle(&["otp", "set", "100", "name", "1234", "-f", "hex"])
+    .unwrap_err()
+    .to_string();
+  let expected = format!(
+    "Could not write OTP slot: {}",
+    nitrokey::Error::LibraryError(nitrokey::LibraryError::InvalidSlot)
   );
+
+  assert_eq!(err, expected);
 }
 
 #[test_device]
-- 
cgit v1.2.1