1 files changed, 16 insertions, 1 deletions
diff --git a/nitrocli/src/tests/mod.rs b/nitrocli/src/tests/mod.rs
index c823f52..0e5d8bc 100644
--- a/nitrocli/src/tests/mod.rs
+++ b/nitrocli/src/tests/mod.rs
@@ -54,6 +54,8 @@ pub trait UnwrapError {
   fn unwrap_str_err(self) -> String;
   /// Unwrap a Error::CommandError variant.
   fn unwrap_cmd_err(self) -> (Option<&'static str>, nitrokey::CommandError);
+  /// Unwrap a Error::LibraryError variant.
+  fn unwrap_lib_err(self) -> (Option<&'static str>, nitrokey::LibraryError);
 }
 
 impl<T> UnwrapError for crate::Result<T>
@@ -69,7 +71,20 @@ where
 
   fn unwrap_cmd_err(self) -> (Option<&'static str>, nitrokey::CommandError) {
     match self.unwrap_err() {
-      crate::Error::CommandError(ctx, err) => (ctx, err),
+      crate::Error::NitrokeyError(ctx, err) => match err {
+        nitrokey::Error::CommandError(err) => (ctx, err),
+        err => panic!("Unexpected error variant found: {:?}", err),
+      },
+      err => panic!("Unexpected error variant found: {:?}", err),
+    }
+  }
+
+  fn unwrap_lib_err(self) -> (Option<&'static str>, nitrokey::LibraryError) {
+    match self.unwrap_err() {
+      crate::Error::NitrokeyError(ctx, err) => match err {
+        nitrokey::Error::LibraryError(err) => (ctx, err),
+        err => panic!("Unexpected error variant found: {:?}", err),
+      },
       err => panic!("Unexpected error variant found: {:?}", err),
     }
   }