From df36c4bf6b60903e458b86af89e2750dbcf263ff Mon Sep 17 00:00:00 2001
From: Szczepan Zalega <szczepan@nitrokey.com>
Date: Fri, 23 Feb 2018 12:51:49 +0100
Subject: Tests: rename _admin related and skip not supported encrypted volume
ro/rw tests
Signed-off-by: Szczepan Zalega <szczepan@nitrokey.com>
---
unittest/test_storage.py | 18 ++++++++++--------
1 file changed, 10 insertions(+), 8 deletions(-)
(limited to 'unittest')
diff --git a/unittest/test_storage.py b/unittest/test_storage.py
index 9897727..41c785f 100644
--- a/unittest/test_storage.py
+++ b/unittest/test_storage.py
@@ -276,29 +276,31 @@ def test_unencrypted_volume_set_read_write(C):
@pytest.mark.unencrypted
-def test_unencrypted_volume_set_read_only(C):
- skip_if_device_version_lower_than({'S': 49})
+def test_unencrypted_volume_set_read_only_admin(C):
+ skip_if_device_version_lower_than({'S': 51})
assert C.NK_lock_device() == DeviceErrorCode.STATUS_OK
- assert C.NK_set_unencrypted_read_only(DefaultPasswords.ADMIN) == DeviceErrorCode.STATUS_OK
+ assert C.NK_set_unencrypted_read_only_admin(DefaultPasswords.ADMIN) == DeviceErrorCode.STATUS_OK
@pytest.mark.unencrypted
-def test_unencrypted_volume_set_read_write(C):
- skip_if_device_version_lower_than({'S': 49})
+def test_unencrypted_volume_set_read_write_admin(C):
+ skip_if_device_version_lower_than({'S': 51})
assert C.NK_lock_device() == DeviceErrorCode.STATUS_OK
- assert C.NK_set_unencrypted_read_write(DefaultPasswords.ADMIN) == DeviceErrorCode.STATUS_OK
+ assert C.NK_set_unencrypted_read_write_admin(DefaultPasswords.ADMIN) == DeviceErrorCode.STATUS_OK
@pytest.mark.encrypted
+@pytest.mark.skip(reason='not supported on recent firmware, except v0.49')
def test_encrypted_volume_set_read_only(C):
- skip_if_device_version_lower_than({'S': 49})
+ skip_if_device_version_lower_than({'S': 99})
assert C.NK_lock_device() == DeviceErrorCode.STATUS_OK
assert C.NK_set_encrypted_read_only(DefaultPasswords.ADMIN) == DeviceErrorCode.STATUS_OK
@pytest.mark.encrypted
+@pytest.mark.skip(reason='not supported on recent firmware, except v0.49')
def test_encrypted_volume_set_read_write(C):
- skip_if_device_version_lower_than({'S': 49})
+ skip_if_device_version_lower_than({'S': 99})
assert C.NK_lock_device() == DeviceErrorCode.STATUS_OK
assert C.NK_set_encrypted_read_write(DefaultPasswords.ADMIN) == DeviceErrorCode.STATUS_OK
--
cgit v1.2.3