Fix groups(), add test, update version

183amir · Dec 2, 2013 · 9e82ec9 · 9e82ec9
1 parent a69d90e
commit 9e82ec9
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/setup.py b/setup.py
@@ -24,7 +24,7 @@
 setup(
 
     name='xbob.db.arface',
-    version='1.2.1a0',
+    version='1.2.1',
     description='AR Face  Database Access API for Bob',
     url='https://pypi.python.org/pypi/xbob.db.arface',
     license='GPLv3',

diff --git a/xbob/db/arface/query.py b/xbob/db/arface/query.py
@@ -53,7 +53,7 @@ def __init__(self, original_directory = None, original_extension = '.ppm'):
   def groups(self, protocol=None):
     """Returns the names of all registered groups"""
 
-    return ProtocolPurpose.group_choices
+    return self.m_groups
 
   def clients(self, groups=None, genders=None, protocol=None):
     """Returns a list of Client objects for the specific query by the user.

diff --git a/xbob/db/arface/test.py b/xbob/db/arface/test.py
@@ -30,6 +30,7 @@ def test01_clients(self):
     db = xbob.db.arface.Database()
 
     # test that the expected number of clients is returned
+    self.assertEqual(len(db.groups()), 3)
     self.assertEqual(len(db.client_ids()), 136)
     self.assertEqual(len(db.client_ids(genders='m')), 76)
     self.assertEqual(len(db.client_ids(genders='w')), 60)