From 025774fc3759683a8ec0f6b1598b1e34b550e6d5 Mon Sep 17 00:00:00 2001
From: Szczepan Zalega <szczepan@nitrokey.com>
Date: Tue, 12 Dec 2017 17:31:36 +0100
Subject: Tests: set debug level from environment variable, show connected
 device model and version

Signed-off-by: Szczepan Zalega <szczepan@nitrokey.com>
---
 NitrokeyManager.cc       | 1 +
 unittest/conftest.py     | 6 ++++--
 unittest/test_storage.py | 2 ++
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/NitrokeyManager.cc b/NitrokeyManager.cc
index eb52eee..de52e25 100644
--- a/NitrokeyManager.cc
+++ b/NitrokeyManager.cc
@@ -30,6 +30,7 @@
 #include <mutex>
 #include "include/cxx_semantics.h"
 #include <functional>
+#include <stick10_commands.h>
 
 std::mutex nitrokey::proto::send_receive_mtx;
 
diff --git a/unittest/conftest.py b/unittest/conftest.py
index edcbff4..26536cf 100644
--- a/unittest/conftest.py
+++ b/unittest/conftest.py
@@ -77,7 +77,8 @@ def C(request):
         print("No library file found")
         sys.exit(1)
 
-    C.NK_set_debug(False)
+    C.NK_set_debug_level(int(os.environ.get('LIBNK_DEBUG', 2)))
+
     nk_login = C.NK_login_auto()
     if nk_login != 1:
         print('No devices detected!')
@@ -86,6 +87,7 @@ def C(request):
     firmware_version = C.NK_get_minor_firmware_version()
     model = 'P' if firmware_version in [7,8] else 'S'
     device_type = (model, firmware_version)
+    print('Connected device: {} {}'.format(model, firmware_version))
 
     # assert C.NK_first_authenticate(DefaultPasswords.ADMIN, DefaultPasswords.ADMIN_TEMP) == DeviceErrorCode.STATUS_OK
     # assert C.NK_user_authenticate(DefaultPasswords.USER, DefaultPasswords.USER_TEMP) == DeviceErrorCode.STATUS_OK
@@ -99,6 +101,6 @@ def C(request):
 
     request.addfinalizer(fin)
     # C.NK_set_debug(True)
-    C.NK_set_debug_level(3)
+    C.NK_set_debug_level(int(os.environ.get('LIBNK_DEBUG', 3)))
 
     return C
diff --git a/unittest/test_storage.py b/unittest/test_storage.py
index 9d39371..f3fd801 100644
--- a/unittest/test_storage.py
+++ b/unittest/test_storage.py
@@ -53,6 +53,8 @@ def test_get_status_storage(C):
     status_dict = get_dict_from_dissect(status_string.decode('ascii'))
     default_admin_password_retry_count = 3
     assert int(status_dict['AdminPwRetryCount']) == default_admin_password_retry_count
+    print('C.NK_get_major_firmware_version(): {}'.format(C.NK_get_major_firmware_version()))
+    print('C.NK_get_minor_firmware_version(): {}'.format(C.NK_get_minor_firmware_version()))
 
 
 @pytest.mark.other
-- 
cgit v1.2.3