Merge branch '27-fix-casia-surf-tests' into 'master'

Resolve "fix CASIA-SURF tests"

Closes #27

See merge request !91

bob/pad/face/test/test_databases.py

@@ -210,11 +210,13 @@ def test_casiasurf():
         preferred_package='bob.pad.face',
         package_prefix='bob.pad.')
     try:
-        assert len(casiasurf.objects(groups=['train', 'dev'], purposes='real')) == 8942 
+        assert len(casiasurf.objects(groups=['train'], purposes='real')) == 8942 
         assert len(casiasurf.objects(groups=['train'], purposes='attack')) == 20324
-        assert len(casiasurf.objects(groups=['dev'], purposes='real')) == 0
-        assert len(casiasurf.objects(groups=['dev'], purposes='attack')) == 9608 
-        
+        assert len(casiasurf.objects(groups=('dev',), purposes=('real',))) == 2994
+        assert len(casiasurf.objects(groups=('dev',), purposes=('attack',))) == 6614
+        assert len(casiasurf.objects(groups=('dev',), purposes=('real','attack'))) == 9608
+        assert len(casiasurf.objects(groups=('eval',), purposes=('attack',))) == 57710
+    
     except IOError as e:
         raise SkipTest(
             "The database could not be queried; probably the db.sql3 file is missing. Here is the error: '%s'"
@@ -351,4 +353,4 @@ def test_casiasurf():
 #     except IOError as e:
 #         raise SkipTest(
 #             "The database could not be queried; probably the db.sql3 file is missing. Here is the error: '%s'"
-#             % e)
+#             % e)
\ No newline at end of file