Merge branch 'fixed_tests' into 'master'

Fix failing tests after corrections to bob.bio.db

Align with the package `bob.bio.db`

See merge request !31

bob/bio/base/test/dummy/database.py

@@ -16,8 +16,8 @@ class DummyDatabase(ZTBioDatabase):
         )
         self.__db = AtntBioDatabase()
 
-    def model_ids(self, group=None, protocol=None, gender=None):
-        return self.__db.model_ids(group, protocol, gender)
+    def model_ids(self, groups=None, protocol=None, gender=None):
+        return self.__db.model_ids(groups, protocol, gender)
 
     def objects(self, groups=None, protocol=None, purposes=None, model_ids=None, **kwargs):
         return self.__db.objects(groups, protocol, purposes, model_ids, **kwargs)

bob/bio/base/test/dummy/fileset.py

@@ -33,8 +33,8 @@ class DummyDatabase(ZTBioDatabase):
             file_sets.append(file_set)
         return file_sets
 
-    def model_ids(self, group=None, protocol=None, gender=None):
-        return self.__db.model_ids(group, protocol, gender)
+    def model_ids(self, groups=None, protocol=None, gender=None):
+        return self.__db.model_ids(groups, protocol, gender)
 
     def objects(self, groups=None, protocol=None, purposes=None, model_ids=None, **kwargs):
         return self.__db.objects(groups, protocol, purposes, model_ids, **kwargs)

bob/bio/base/tools/FileSelector.py

@@ -158,7 +158,7 @@ class FileSelector:
 
   def model_ids(self, group):
     """Returns the sorted list of model ids from the given group."""
-    return sorted(self.database.model_ids(group = group))
+    return sorted(self.database.model_ids(groups=group))
 
   def enroll_files(self, model_id, group, directory_type):
     """Returns the list of model feature files used for enrollment of the model with the given model_id from the given group.
@@ -190,7 +190,7 @@ class FileSelector:
 
   def t_model_ids(self, group):
     """Returns the sorted list of T-Norm-model ids from the given group."""
-    return sorted(self.database.t_model_ids(group = group))
+    return sorted(self.database.t_model_ids(groups = group))
 
   def t_enroll_files(self, t_model_id, group, directory_type):
     """Returns the list of T-norm model files used for enrollment of the given model_id from the given group."""