From 21baea570ef2b67a64074202a726ad1daea11f7b Mon Sep 17 00:00:00 2001
From: Andre Anjos <andre.anjos@idiap.ch>
Date: Tue, 4 Oct 2016 13:36:22 +0200
Subject: [PATCH] Fix tests (closes #6)
---
bob/bio/vein/configurations/utfvp.py | 5 ++++-
bob/bio/vein/configurations/verafinger.py | 5 ++++-
bob/bio/vein/database/utfvp.py | 2 +-
bob/bio/vein/database/verafinger.py | 2 +-
bob/bio/vein/tests/test_databases.py | 14 +++++++++-----
5 files changed, 19 insertions(+), 9 deletions(-)
diff --git a/bob/bio/vein/configurations/utfvp.py b/bob/bio/vein/configurations/utfvp.py
index eb742b0..6b40cc5 100644
--- a/bob/bio/vein/configurations/utfvp.py
+++ b/bob/bio/vein/configurations/utfvp.py
@@ -22,7 +22,10 @@ from bob.bio.vein.database import UtfvpBioDatabase
utfvp_directory = "[YOUR_UTFVP_DIRECTORY]"
"""Value of ``~/.bob_bio_databases.txt`` for this database"""
-database = UtfvpBioDatabase(original_directory = utfvp_directory)
+database = UtfvpBioDatabase(
+ original_directory = utfvp_directory,
+ original_extension = '.png',
+ )
"""The :py:class:`bob.bio.base.database.BioDatabase` derivative with UTFVP settings
.. warning::
diff --git a/bob/bio/vein/configurations/verafinger.py b/bob/bio/vein/configurations/verafinger.py
index f0b9aba..9b64210 100644
--- a/bob/bio/vein/configurations/verafinger.py
+++ b/bob/bio/vein/configurations/verafinger.py
@@ -20,7 +20,10 @@ from bob.bio.vein.database import VerafingerBioDatabase
verafinger_directory = "[YOUR_VERAFINGER_DIRECTORY]"
"""Value of ``~/.bob_bio_databases.txt`` for this database"""
-database = VerafingerBioDatabase(original_directory = verafinger_directory)
+database = VerafingerBioDatabase(
+ original_directory = verafinger_directory,
+ original_extension = '.png',
+ )
"""The :py:class:`bob.bio.base.database.BioDatabase` derivative with Verafinger
database settings
diff --git a/bob/bio/vein/database/utfvp.py b/bob/bio/vein/database/utfvp.py
index 8fe5a5a..b8f09a0 100644
--- a/bob/bio/vein/database/utfvp.py
+++ b/bob/bio/vein/database/utfvp.py
@@ -3,7 +3,7 @@
# Tue 27 Sep 2016 16:49:05 CEST
from .database import VeinBioFile
-from bob.bio.base.database import BioDatabase, BioFile
+from bob.bio.base.database import BioDatabase
class UtfvpBioDatabase(BioDatabase):
diff --git a/bob/bio/vein/database/verafinger.py b/bob/bio/vein/database/verafinger.py
index a33e2e4..23d3ff2 100644
--- a/bob/bio/vein/database/verafinger.py
+++ b/bob/bio/vein/database/verafinger.py
@@ -4,7 +4,7 @@
from .database import VeinBioFile
-from bob.bio.base.database import BioDatabase, BioFile
+from bob.bio.base.database import BioDatabase
class VerafingerBioDatabase(BioDatabase):
diff --git a/bob/bio/vein/tests/test_databases.py b/bob/bio/vein/tests/test_databases.py
index 3903a35..08c7c55 100644
--- a/bob/bio/vein/tests/test_databases.py
+++ b/bob/bio/vein/tests/test_databases.py
@@ -6,14 +6,16 @@ from nose.plugins.skip import SkipTest
import bob.bio.base
from bob.bio.base.test.utils import db_available
-from bob.bio.base.test.test_database_implementations import check_database, check_database_zt
+from bob.bio.base.test.test_database_implementations import check_database
@db_available('utfvp')
def test_utfvp():
- database = bob.bio.base.load_resource('utfvp', 'database', preferred_package='bob.bio.vein')
+ module = bob.bio.base.load_resource('utfvp', 'config',
+ preferred_package='bob.bio.vein')
try:
- check_database(database, protocol='nomLeftRing', groups=('dev', 'eval'))
+ check_database(module.database, protocol=module.protocol,
+ groups=('dev', 'eval'))
except IOError as e:
raise SkipTest(
"The database could not queried; probably the db.sql3 file is missing. Here is the error: '%s'" % e)
@@ -21,9 +23,11 @@ def test_utfvp():
@db_available('verafinger')
def test_verafinger():
- database = bob.bio.base.load_resource('verafinger', 'database', preferred_package='bob.bio.vein')
+ module = bob.bio.base.load_resource('verafinger', 'config',
+ preferred_package='bob.bio.vein')
try:
- check_database(database, protocol='Fifty', groups=('dev', 'eval'))
+ check_database(module.database, protocol='Fifty', groups=('dev',
+ 'eval'))
except IOError as e:
raise SkipTest(
"The database could not queried; probably the db.sql3 file is missing. Here is the error: '%s'" % e)
--
GitLab