From 59ca679eeb272163e4ebbb2f01231adc4820cda1 Mon Sep 17 00:00:00 2001
From: Szczepan Zalega <szczepan@nitrokey.com>
Date: Tue, 28 Jan 2020 14:52:09 +0100
Subject: Refactor move

---
 unittest/constants.py |  2 --
 unittest/helpers.py   | 22 ++++++++++++++++++++++
 unittest/test_pro.py  | 19 ++-----------------
 3 files changed, 24 insertions(+), 19 deletions(-)
 create mode 100644 unittest/helpers.py

diff --git a/unittest/constants.py b/unittest/constants.py
index 1ba52fa..b73dfe8 100644
--- a/unittest/constants.py
+++ b/unittest/constants.py
@@ -21,8 +21,6 @@ SPDX-License-Identifier: LGPL-3.0
 
 from misc import to_hex
 
-def bb(x):
-    return bytes(x, encoding='ascii')
 
 
 RFC_SECRET_HR = '12345678901234567890'
diff --git a/unittest/helpers.py b/unittest/helpers.py
new file mode 100644
index 0000000..79f4e1e
--- /dev/null
+++ b/unittest/helpers.py
@@ -0,0 +1,22 @@
+def bb(x):
+    return bytes(x, encoding='ascii')
+
+
+def helper_fill(str_to_fill, target_width):
+    assert target_width >= len(str_to_fill)
+    numbers = '1234567890' * 4
+    str_to_fill += numbers[:target_width - len(str_to_fill)]
+    assert len(str_to_fill) == target_width
+    return bb(str_to_fill)
+
+
+def helper_PWS_get_pass(suffix):
+    return helper_fill('pass' + suffix, 20)
+
+
+def helper_PWS_get_loginname(suffix):
+    return helper_fill('login' + suffix, 32)
+
+
+def helper_PWS_get_slotname(suffix):
+    return helper_fill('slotname' + suffix, 11)
\ No newline at end of file
diff --git a/unittest/test_pro.py b/unittest/test_pro.py
index 2a5f02a..233d4d2 100644
--- a/unittest/test_pro.py
+++ b/unittest/test_pro.py
@@ -22,8 +22,9 @@ SPDX-License-Identifier: LGPL-3.0
 import pytest
 
 from conftest import skip_if_device_version_lower_than
-from constants import DefaultPasswords, DeviceErrorCode, RFC_SECRET, bb, bbRFC_SECRET, LibraryErrors, HOTP_slot_count, \
+from constants import DefaultPasswords, DeviceErrorCode, RFC_SECRET, bbRFC_SECRET, LibraryErrors, HOTP_slot_count, \
     TOTP_slot_count
+from helpers import helper_PWS_get_slotname, helper_PWS_get_loginname, helper_PWS_get_pass, bb
 from misc import ffi, gs, wait, cast_pointer_to_tuple, has_binary_counter
 from misc import is_storage
 
@@ -88,22 +89,6 @@ def test_write_all_password_safe_slots_and_read_10_times(C):
 @pytest.mark.slowtest
 @pytest.mark.xfail(reason="This test should be run directly after test_write_all_password_safe_slots_and_read_10_times")
 def test_read_all_password_safe_slots_10_times(C):
-    def helper_fill(str_to_fill, target_width):
-        assert target_width >= len(str_to_fill)
-        numbers = '1234567890'*4
-        str_to_fill += numbers[:target_width - len(str_to_fill)]
-        assert len(str_to_fill) == target_width
-        return bb(str_to_fill)
-
-    def helper_PWS_get_pass(suffix):
-        return helper_fill('pass' + suffix, 20)
-
-    def helper_PWS_get_loginname(suffix):
-        return helper_fill('login' + suffix, 32)
-
-    def helper_PWS_get_slotname(suffix):
-        return helper_fill('slotname' + suffix, 11)
-
     assert C.NK_lock_device() == DeviceErrorCode.STATUS_OK
     assert C.NK_enable_password_safe(DefaultPasswords.USER) == DeviceErrorCode.STATUS_OK
     PWS_slot_count = 16
-- 
cgit v1.2.3