From 9c5364a63e363a6f69afddb29453efc5e4b12cc0 Mon Sep 17 00:00:00 2001 From: Robin Krahl Date: Sun, 16 Dec 2018 15:49:14 +0000 Subject: Remove test-no-device feature Currently, the test-no-device feature is used for tests that expect no Nitrokey to be connected. Yet test-no-device is equivalent to not test-pro and not test-storage. Therefore, this patch removes the test-no-device feature. --- tests/device.rs | 2 +- tests/util/mod.rs | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) (limited to 'tests') diff --git a/tests/device.rs b/tests/device.rs index 7ceac1e..2c8cfa6 100644 --- a/tests/device.rs +++ b/tests/device.rs @@ -24,7 +24,7 @@ fn count_nitrokey_block_devices() -> usize { } #[test] -#[cfg_attr(not(feature = "test-no-device"), ignore)] +#[cfg_attr(any(feature = "test-pro", feature = "test-storage"), ignore)] fn connect_no_device() { assert!(nitrokey::connect().is_err()); assert!(nitrokey::Pro::connect().is_err()); diff --git a/tests/util/mod.rs b/tests/util/mod.rs index 257586e..c2c94e2 100644 --- a/tests/util/mod.rs +++ b/tests/util/mod.rs @@ -1,10 +1,7 @@ pub static ADMIN_PASSWORD: &str = "12345678"; pub static USER_PASSWORD: &str = "123456"; -#[cfg(feature = "test-no-device")] -pub type Target = nitrokey::Pro; - -#[cfg(feature = "test-pro")] +#[cfg(not(feature = "test-storage"))] pub type Target = nitrokey::Pro; #[cfg(feature = "test-storage")] -- cgit v1.2.3