Switch unit tests for rollback on failing devices to use start/stop p…

…ool funcionality
stratis-storage · Apr 18, 2022 · 0e04bcf · 0e04bcf
1 parent baea8f7
commit 0e04bcf
Showing 1 changed file with 5 additions and 8 deletions.
diff --git a/src/engine/strat_engine/engine.rs b/src/engine/strat_engine/engine.rs
@@ -616,7 +616,7 @@ mod test {
         strat_engine::{
             backstore::crypt_metadata_size,
             cmd,
-            tests::{crypt, dm_stratis_devices_remove, loopbacked, real, FailDevice},
+            tests::{crypt, loopbacked, real, FailDevice},
             udev::{CRYPTO_FS_TYPE, FS_TYPE_KEY},
         },
         types::{
@@ -794,7 +794,7 @@ mod test {
         F: Fn(&mut StratPool) -> Result<(), Box<dyn Error>>,
     {
         fn needs_clean_up<F>(
-            engine: StratEngine,
+            engine: &StratEngine,
             uuid: PoolUuid,
             fail_device: &FailDevice,
             operation: F,
@@ -824,8 +824,6 @@ mod test {
 
             fail_device.stop_failing()?;
 
-            engine.teardown()?;
-
             Ok(())
         }
 
@@ -873,13 +871,12 @@ mod test {
 
         test_async!(engine.handle_events(events));
 
-        let res = needs_clean_up(engine, uuid, fail_device, operation);
+        let res = needs_clean_up(&engine, uuid, fail_device, operation);
 
-        dm_stratis_devices_remove()?;
+        test_async!(engine.stop_pool(uuid))?;
         res?;
 
-        let engine = StratEngine::initialize()?;
-        test_async!(engine.unlock_pool(uuid, unlock_method))?;
+        test_async!(engine.start_pool(uuid, Some(unlock_method)))?;
         test_async!(engine.destroy_pool(uuid))?;
         engine.teardown()?;