1 files changed, 36 insertions, 25 deletions

diff --git a/nitrocli/src/tests/pin.rs b/nitrocli/src/tests/pin.rs
index e4cd316..958a36d 100644
--- a/nitrocli/src/tests/pin.rs
+++ b/nitrocli/src/tests/pin.rs
@@ -23,40 +23,48 @@ use nitrokey::Device;
 use super::*;
 
 #[test_device]
-fn unblock(device: nitrokey::DeviceWrapper) -> crate::Result<()> {
-  let (device, err) = device.authenticate_user("wrong-pin").unwrap_err();
-  match err {
-    nitrokey::Error::CommandError(err) if err == nitrokey::CommandError::WrongPassword => (),
-    _ => panic!("Unexpected error variant found: {:?}", err),
+fn unblock(model: nitrokey::Model) -> crate::Result<()> {
+  {
+    let mut manager = nitrokey::force_take()?;
+    let device = manager.connect_model(model)?;
+    let (device, err) = device.authenticate_user("wrong-pin").unwrap_err();
+    match err {
+      nitrokey::Error::CommandError(err) if err == nitrokey::CommandError::WrongPassword => (),
+      _ => panic!("Unexpected error variant found: {:?}", err),
+    }
+    assert!(device.get_user_retry_count()? < 3);
   }
-  assert!(device.get_user_retry_count()? < 3);
 
-  let model = device.get_model();
-  let _ = Nitrocli::with_dev(device).handle(&["pin", "unblock"])?;
-  let device = nitrokey::connect_model(model)?;
-  assert_eq!(device.get_user_retry_count()?, 3);
+  let _ = Nitrocli::with_model(model).handle(&["pin", "unblock"])?;
+
+  {
+    let mut manager = nitrokey::force_take()?;
+    let device = manager.connect_model(model)?;
+    assert_eq!(device.get_user_retry_count()?, 3);
+  }
   Ok(())
 }
 
 #[test_device]
-fn set_user(device: nitrokey::DeviceWrapper) -> crate::Result<()> {
-  let mut ncli = Nitrocli::with_dev(device);
-
+fn set_user(model: nitrokey::Model) -> crate::Result<()> {
+  let mut ncli = Nitrocli::with_model(model);
   // Set a new user PIN.
   ncli.new_user_pin("new-pin");
   let out = ncli.handle(&["pin", "set", "user"])?;
   assert!(out.is_empty());
 
-  let device = nitrokey::connect_model(ncli.model().unwrap())?;
-  let (device, err) = device
-    .authenticate_user(nitrokey::DEFAULT_USER_PIN)
-    .unwrap_err();
+  {
+    let mut manager = nitrokey::force_take()?;
+    let device = manager.connect_model(model)?;
+    let (_, err) = device
+      .authenticate_user(nitrokey::DEFAULT_USER_PIN)
+      .unwrap_err();
 
-  match err {
-    nitrokey::Error::CommandError(err) if err == nitrokey::CommandError::WrongPassword => (),
-    _ => panic!("Unexpected error variant found: {:?}", err),
+    match err {
+      nitrokey::Error::CommandError(err) if err == nitrokey::CommandError::WrongPassword => (),
+      _ => panic!("Unexpected error variant found: {:?}", err),
+    }
   }
-  drop(device);
 
   // Revert to the default user PIN.
   ncli.user_pin("new-pin");
@@ -65,9 +73,12 @@ fn set_user(device: nitrokey::DeviceWrapper) -> crate::Result<()> {
   let out = ncli.handle(&["pin", "set", "user"])?;
   assert!(out.is_empty());
 
-  let device = nitrokey::connect_model(ncli.model().unwrap())?;
-  let _ = device
-    .authenticate_user(nitrokey::DEFAULT_USER_PIN)
-    .unwrap();
+  {
+    let mut manager = nitrokey::force_take()?;
+    let device = manager.connect_model(ncli.model().unwrap())?;
+    let _ = device
+      .authenticate_user(nitrokey::DEFAULT_USER_PIN)
+      .unwrap();
+  }
   Ok(())
 }