aboutsummaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorRobin Krahl <robin.krahl@ireas.org>2018-12-16 15:49:14 +0000
committerRobin Krahl <robin.krahl@ireas.org>2018-12-16 17:04:59 +0100
commit9c5364a63e363a6f69afddb29453efc5e4b12cc0 (patch)
treef195c9338e76d896d3e7519d38242a105ace858d /tests
parent7f0c2e550d0439d0311da71806e19f893725b40b (diff)
downloadnitrokey-rs-9c5364a63e363a6f69afddb29453efc5e4b12cc0.tar.gz
nitrokey-rs-9c5364a63e363a6f69afddb29453efc5e4b12cc0.tar.bz2
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.
Diffstat (limited to 'tests')
-rw-r--r--tests/device.rs2
-rw-r--r--tests/util/mod.rs5
2 files changed, 2 insertions, 5 deletions
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")]