aboutsummaryrefslogtreecommitdiff
path: root/unittest/conftest.py
diff options
context:
space:
mode:
authorSzczepan Zalega <szczepan@nitrokey.com>2018-07-07 21:24:14 +0200
committerSzczepan Zalega <szczepan@nitrokey.com>2018-07-07 21:24:14 +0200
commit430e4b4116ec00c4875170642f8ae04bc3497d88 (patch)
treed158fe787ecf1b20cd906dda712ecee8f7285a59 /unittest/conftest.py
parent4b3b21dfe6958376db3b1fbcadf6e03f53291e4f (diff)
parent601f43bfa71b479e32a289eaeec75069cbc7c26f (diff)
downloadlibnitrokey-430e4b4116ec00c4875170642f8ae04bc3497d88.tar.gz
libnitrokey-430e4b4116ec00c4875170642f8ae04bc3497d88.tar.bz2
Merge branch 'pr_116'v3.4
Allow to connect to device with model specified by enum. Fixes #116
Diffstat (limited to 'unittest/conftest.py')
-rw-r--r--unittest/conftest.py1
1 files changed, 0 insertions, 1 deletions
diff --git a/unittest/conftest.py b/unittest/conftest.py
index 35cc714..253e1d8 100644
--- a/unittest/conftest.py
+++ b/unittest/conftest.py
@@ -44,7 +44,6 @@ def C(request=None):
cnt = 0
a = iter(declarations)
for declaration in a:
- if 'NK_device_model' in declaration: continue
if declaration.strip().startswith('NK_C_API'):
declaration = declaration.replace('NK_C_API', '').strip()
while ';' not in declaration: