diff options
Diffstat (limited to 'nitrocli/src/tests')
-rw-r--r-- | nitrocli/src/tests/encrypted.rs (renamed from nitrocli/src/tests/storage.rs) | 12 | ||||
-rw-r--r-- | nitrocli/src/tests/lock.rs | 2 | ||||
-rw-r--r-- | nitrocli/src/tests/mod.rs | 2 |
3 files changed, 8 insertions, 8 deletions
diff --git a/nitrocli/src/tests/storage.rs b/nitrocli/src/tests/encrypted.rs index a1c6ecf..8aef864 100644 --- a/nitrocli/src/tests/storage.rs +++ b/nitrocli/src/tests/encrypted.rs @@ -1,4 +1,4 @@ -// storage.rs +// encrypted.rs // ************************************************************************* // * Copyright (C) 2019 Daniel Mueller (deso@posteo.net) * @@ -48,11 +48,11 @@ $"#, let out = ncli.handle(&["status"])?; assert!(make_re(None).is_match(&out), out); - let _ = ncli.handle(&["storage", "open"])?; + let _ = ncli.handle(&["encrypted", "open"])?; let out = ncli.handle(&["status"])?; assert!(make_re(Some(true)).is_match(&out), out); - let _ = ncli.handle(&["storage", "close"])?; + let _ = ncli.handle(&["encrypted", "close"])?; let out = ncli.handle(&["status"])?; assert!(make_re(Some(false)).is_match(&out), out); @@ -61,7 +61,7 @@ $"#, #[test_device] fn encrypted_open_on_pro(device: nitrokey::Pro) { - let res = Nitrocli::with_dev(device).handle(&["storage", "open"]); + let res = Nitrocli::with_dev(device).handle(&["encrypted", "open"]); assert_eq!( res.unwrap_str_err(), "This command is only available on the Nitrokey Storage", @@ -71,7 +71,7 @@ fn encrypted_open_on_pro(device: nitrokey::Pro) { #[test_device] fn encrypted_open_close(device: nitrokey::Storage) -> crate::Result<()> { let mut ncli = Nitrocli::with_dev(device); - let out = ncli.handle(&["storage", "open"])?; + let out = ncli.handle(&["encrypted", "open"])?; assert!(out.is_empty()); let device = nitrokey::Storage::connect()?; @@ -79,7 +79,7 @@ fn encrypted_open_close(device: nitrokey::Storage) -> crate::Result<()> { assert!(!device.get_status()?.hidden_volume.active); drop(device); - let out = ncli.handle(&["storage", "close"])?; + let out = ncli.handle(&["encrypted", "close"])?; assert!(out.is_empty()); let device = nitrokey::Storage::connect()?; diff --git a/nitrocli/src/tests/lock.rs b/nitrocli/src/tests/lock.rs index 1993350..d23d2ae 100644 --- a/nitrocli/src/tests/lock.rs +++ b/nitrocli/src/tests/lock.rs @@ -31,7 +31,7 @@ fn lock_pro(device: nitrokey::Pro) -> crate::Result<()> { #[test_device] fn lock_storage(device: nitrokey::Storage) -> crate::Result<()> { let mut ncli = Nitrocli::with_dev(device); - let _ = ncli.handle(&["storage", "open"])?; + let _ = ncli.handle(&["encrypted", "open"])?; let out = ncli.handle(&["lock"])?; assert!(out.is_empty()); diff --git a/nitrocli/src/tests/mod.rs b/nitrocli/src/tests/mod.rs index 2d6f93c..70a3d20 100644 --- a/nitrocli/src/tests/mod.rs +++ b/nitrocli/src/tests/mod.rs @@ -37,6 +37,7 @@ const NITROKEY_DEFAULT_USER_PIN: &str = "123456"; fn dummy() {} mod config; +mod encrypted; mod hidden; mod lock; mod otp; @@ -45,7 +46,6 @@ mod pws; mod reset; mod run; mod status; -mod storage; /// A trait simplifying checking for expected errors. pub trait UnwrapError { |