diff options
| author | Szczepan Zalega <szczepan@nitrokey.com> | 2017-12-12 16:58:24 +0100 |
|---|---|---|
| committer | Szczepan Zalega <szczepan@nitrokey.com> | 2018-02-23 15:42:37 +0100 |
| commit | 809b618d4d064cedc7070cac5ccc8797e5d89f54 (patch) | |
| tree | d2423759226e6f0a7d016ca2866acd03c35abbe7 /unittest/conftest.py | |
| parent | 0b0898f2b5d88738aa8f49ce6b9ba98db1c775f7 (diff) | |
| download | libnitrokey-809b618d4d064cedc7070cac5ccc8797e5d89f54.tar.gz libnitrokey-809b618d4d064cedc7070cac5ccc8797e5d89f54.tar.bz2 | |
Correct getting minor and major from firmware version
Add get_minor_firmware_version
Correct get_major_firmware version (was returning minor instead)
Name 3rd version field for test builds
Use minor firmware version in tests
Signed-off-by: Szczepan Zalega <szczepan@nitrokey.com>
Diffstat (limited to 'unittest/conftest.py')
| -rw-r--r-- | unittest/conftest.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/unittest/conftest.py b/unittest/conftest.py index 8f386e0..edcbff4 100644 --- a/unittest/conftest.py +++ b/unittest/conftest.py @@ -83,7 +83,7 @@ def C(request): print('No devices detected!') assert nk_login != 0 # returns 0 if not connected or wrong model or 1 when connected global device_type - firmware_version = C.NK_get_major_firmware_version() + firmware_version = C.NK_get_minor_firmware_version() model = 'P' if firmware_version in [7,8] else 'S' device_type = (model, firmware_version) |