aboutsummaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorRobin Krahl <robin.krahl@ireas.org>2019-01-27 23:34:04 +0000
committerRobin Krahl <robin.krahl@ireas.org>2019-01-28 00:36:53 +0100
commit1d68e24db4078ad1a004afd7bec90a81e7d31ec8 (patch)
treefafbdf83ccf00838adf224bec0813320a23d75cc /tests
parentc30cbd35ba187cd6e5055d3beb8420b11fb030ec (diff)
downloadnitrokey-rs-1d68e24db4078ad1a004afd7bec90a81e7d31ec8.tar.gz
nitrokey-rs-1d68e24db4078ad1a004afd7bec90a81e7d31ec8.tar.bz2
Add get_firmware_version method
This patch combines the get_{major,minor}_firmware_version methods into the new get_firmware_version method that returns a FirmwareVersion struct. Currently, this requires casting from i32 to u8. But this will be fixed with the next libnitrokey version as we change the return types for the firmware getters.
Diffstat (limited to 'tests')
-rw-r--r--tests/device.rs7
1 files changed, 3 insertions, 4 deletions
diff --git a/tests/device.rs b/tests/device.rs
index 7ab4d66..d80f011 100644
--- a/tests/device.rs
+++ b/tests/device.rs
@@ -95,10 +95,9 @@ fn get_serial_number(device: DeviceWrapper) {
}
#[test_device]
fn get_firmware_version(device: Pro) {
- assert_ok!(0, device.get_major_firmware_version());
- let minor = device.get_minor_firmware_version();
- assert!(minor.is_ok());
- assert!(minor.unwrap() > 0);
+ let version = device.get_firmware_version().unwrap();
+ assert_eq!(0, version.major);
+ assert!(version.minor > 0);
}
fn admin_retry<T: Authenticate + Device>(device: T, suffix: &str, count: u8) -> T {