tracker: make is_indexed and is_not_indexed raise exception instead

Summary:
They are now assert_indexed and assert_not_indexer. This provides more
useful backtrace if an error occures.

Reviewers: smcv, pwith

Differential Revision: https://phabricator.apertis.org/D395

tracker/automated/test-tracker.py

@@ -50,11 +50,11 @@ class TrackerTest(unittest.TestCase):
 
     def assert_indexed(self, filename, extra=None):
         uri = 'file://%s/%s' % (self.homedir, filename)
-        self.assertTrue(self.indexer.is_indexed(uri, extra))
+        self.indexer.assert_indexed(uri, extra)
 
     def assert_not_indexed(self, filename):
         uri = 'file://%s/%s' % (self.homedir, filename)
-        self.assertTrue(self.indexer.is_not_indexed(uri))
+        self.indexer.assert_not_indexed(uri)
 
     def tracker_inital_tests(self):
         playable_query = '?urn bosch:playable true . '

tracker/common.py

@@ -110,7 +110,7 @@ class TrackerIndexer():
         self.wait_files = True
         self.loop.run()
 
-    def is_indexed(self, uri, extra=None):
+    def assert_indexed(self, uri, extra=None):
         query = ('select ?urn where { '
                  '  ?urn nie:url "%s" ; '
                  '  tracker:available true . ') % (uri)
@@ -120,9 +120,13 @@ class TrackerIndexer():
 
         # Must have one and only one result
         cursor = self.conn.query(query, None)
-        return cursor.next(None) and not cursor.next(None)
+        if not cursor.next(None):
+            raise Exception("Query '%s' returned no result" % query)
+        if cursor.next(None):
+            raise Exception("Query '%s' returned more than one result" % query)
 
-    def is_not_indexed(self, uri):
+    def assert_not_indexed(self, uri):
         query = ('select ?urn where { ?urn nie:url "%s" }') % (uri)
         cursor = self.conn.query(query, None)
-        return not cursor.next(None)
+        if cursor.next(None):
+            raise Exception("Query '%s' returned results" % query)

tracker/manual/test-removable-device.py

@@ -36,7 +36,7 @@ class TestRemovableDevice(unittest.TestCase):
 
     def assert_indexed(self, filename, extra=None):
         uri = 'file://%s/%s' % (self.path, filename)
-        self.assertTrue(self.indexer.is_indexed(uri, extra))
+        self.indexer.assert_indexed(uri, extra)
 
     def test_removable_device(self):
         print('Please insert storage ...')