1 files changed, 20 insertions, 14 deletions
diff --git a/nitrocli/src/tests/reset.rs b/nitrocli/src/tests/reset.rs
index f9452ec..e197970 100644
--- a/nitrocli/src/tests/reset.rs
+++ b/nitrocli/src/tests/reset.rs
@@ -23,32 +23,38 @@ use nitrokey::GetPasswordSafe;
 use super::*;
 
 #[test_device]
-fn reset(device: nitrokey::DeviceWrapper) -> crate::Result<()> {
+fn reset(model: nitrokey::Model) -> crate::Result<()> {
   let new_admin_pin = "87654321";
-  let mut ncli = Nitrocli::with_dev(device);
+  let mut ncli = Nitrocli::with_model(model);
 
   // Change the admin PIN.
   ncli.new_admin_pin(new_admin_pin);
   let _ = ncli.handle(&["pin", "set", "admin"])?;
 
-  // Check that the admin PIN has been changed.
-  let device = nitrokey::connect_model(ncli.model().unwrap())?;
-  let _ = device.authenticate_admin(new_admin_pin).unwrap();
+  {
+    let mut manager = nitrokey::force_take()?;
+    // Check that the admin PIN has been changed.
+    let device = manager.connect_model(ncli.model().unwrap())?;
+    let _ = device.authenticate_admin(new_admin_pin).unwrap();
+  }
 
   // Perform factory reset
   ncli.admin_pin(new_admin_pin);
   let out = ncli.handle(&["reset"])?;
   assert!(out.is_empty());
 
-  // Check that the admin PIN has been reset.
-  let device = nitrokey::connect_model(ncli.model().unwrap())?;
-  let mut device = device
-    .authenticate_admin(nitrokey::DEFAULT_ADMIN_PIN)
-    .unwrap();
-
-  // Check that the password store works, i.e., the AES key has been
-  // built.
-  let _ = device.get_password_safe(nitrokey::DEFAULT_USER_PIN)?;
+  {
+    let mut manager = nitrokey::force_take()?;
+    // Check that the admin PIN has been reset.
+    let device = manager.connect_model(ncli.model().unwrap())?;
+    let mut device = device
+      .authenticate_admin(nitrokey::DEFAULT_ADMIN_PIN)
+      .unwrap();
+
+    // Check that the password store works, i.e., the AES key has been
+    // built.
+    let _ = device.get_password_safe(nitrokey::DEFAULT_USER_PIN)?;
+  }
 
   Ok(())
 }