Merge branch 'refactoring_2016' into 'master'

the mobio database does not provide annotations when videos are used

See merge request !13

bob/bio/video/database/mobio.py

@@ -69,4 +69,8 @@ class MobioBioDatabase(ZTBioDatabase):
         return [MobioBioFile(f) for f in retval]
 
     def annotations(self, myfile):
-        return self._db.annotations(myfile._f)
+        '''
+        Annotations are not available when using videos
+        '''
+        return None
+        # return self._db.annotations(myfile._f)

bob/bio/video/test/test_databases.py

@@ -35,7 +35,7 @@ def test_youtube():
         raise SkipTest(
             "The database could not queried; probably the db.sql3 file is missing. Here is the error: '%s'" % e)
     try:
-        _check_annotations(database, limit_files=1000)
+        _check_annotations(database, limit_files=1000, topleft=True, framed=True)
     except IOError as e:
         raise SkipTest(
             "The annotations could not be queried; probably the annotation files are missing. Here is the error: '%s'" % e)
@@ -49,8 +49,3 @@ def test_mobio():
     except IOError as e:
         raise SkipTest(
             "The database could not queried; probably the db.sql3 file is missing. Here is the error: '%s'" % e)
-    try:
-        _check_annotations(database, required=False, limit_files=1000)
-    except IOError as e:
-        raise SkipTest(
-            "The annotations could not be queried; probably the annotation files are missing. Here is the error: '%s'" % e)