Commit 24f53216 authored by Amir MOHAMMADI's avatar Amir MOHAMMADI
Browse files

Merge branch 'noztfilelist' into 'master'

Test filelist databases when no zt files exist

See merge request !114
parents 45983b2d 6c92c1ce
Pipeline #13969 passed with stages
in 10 minutes and 41 seconds
......@@ -10,6 +10,9 @@ from .. import BioFile
from .models import ListReader
import logging
logger = logging.getLogger('bob.bio.base')
class FileListBioDatabase(ZTBioDatabase):
"""This class provides a user-friendly interface to databases that are given as file lists.
......@@ -226,10 +229,12 @@ class FileListBioDatabase(ZTBioDatabase):
if group == 'world':
continue
if add_zt_files:
if not self.implements_zt(self.protocol, group):
raise ValueError("ZT score files are requested, but no such files are defined in group %s for protocol %s", group, self.protocol)
files += self.tobjects(group, self.protocol)
files += self.zobjects(group, self.protocol, **self.z_probe_options)
if self.implements_zt(self.protocol, group):
files += self.tobjects(group, self.protocol)
files += self.zobjects(group, self.protocol, **self.z_probe_options)
else:
logger.warn("ZT score files are requested, but no such files are defined in group %s for protocol %s", group, self.protocol)
return self.sort(self._make_bio(files))
......
......@@ -136,6 +136,12 @@ def test_query_protocol():
assert len(db.objects(protocol=prot, groups='dev', purposes='probe')) == 9
def test_noztnorm():
db = FileListBioDatabase(os.path.join(os.path.dirname(example_dir),
'example_filelist2'), 'test')
assert len(db.all_files())
def test_query_dense():
db = FileListBioDatabase(example_dir, 'test', use_dense_probe_file_list=True)
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment