diff options
| author | Sam Thursfield <sam@afuera.me.uk> | 2019-12-08 12:53:06 +0000 |
|---|---|---|
| committer | Sam Thursfield <sam@afuera.me.uk> | 2019-12-08 12:53:06 +0000 |
| commit | 617e2271f3d07722db65e76b43cdc921d5b8aa92 (patch) | |
| tree | dc29c724b90818c50eb5abc05f39c2b07452364a | |
| parent | 76a5035322a4a3f0702e3f440d21dc9666f5068b (diff) | |
| parent | b6e2fee9864f1cadb229d88bd8ff6d5744a1ab0d (diff) | |
| download | tracker-617e2271f3d07722db65e76b43cdc921d5b8aa92.tar.gz | |
Merge branch 'wip/carlosg/test-fixes' into 'master'
Miscellaneous test fixes for tracker-miners
See merge request GNOME/tracker!161
| -rw-r--r-- | src/libtracker-data/tracker-db-interface-sqlite.c | 5 | ||||
| -rw-r--r-- | utils/trackertestutils/helpers.py | 10 |
2 files changed, 9 insertions, 6 deletions
diff --git a/src/libtracker-data/tracker-db-interface-sqlite.c b/src/libtracker-data/tracker-db-interface-sqlite.c index 92e72c7a8..9cd28e56c 100644 --- a/src/libtracker-data/tracker-db-interface-sqlite.c +++ b/src/libtracker-data/tracker-db-interface-sqlite.c @@ -2180,11 +2180,12 @@ tracker_db_interface_sqlite_fts_create_delete_all_query (TrackerDBInterface *db_ insert_str = g_string_new (NULL); g_string_append_printf (insert_str, "INSERT INTO \"%s\".fts5 (fts5, rowid %s) " - "SELECT 'delete', rowid %s FROM fts_view " + "SELECT 'delete', rowid %s FROM \"%s\".fts_view " "WHERE rowid = ?", database, db_interface->fts_properties, - db_interface->fts_properties); + db_interface->fts_properties, + database); return g_string_free (insert_str, FALSE); } diff --git a/utils/trackertestutils/helpers.py b/utils/trackertestutils/helpers.py index 07b176b9a..037eb032c 100644 --- a/utils/trackertestutils/helpers.py +++ b/utils/trackertestutils/helpers.py @@ -338,7 +338,8 @@ class StoreHelper(): # Check the list of previously received events for matches (existing_match, self.inserts_list) = find_property_change(self.inserts_list) - (existing_match, self.deletes_list) = find_property_change(self.deletes_list) + if not existing_match: + (existing_match, self.deletes_list) = find_property_change(self.deletes_list) if not existing_match: self._enable_await_timeout() @@ -350,9 +351,10 @@ class StoreHelper(): except GraphUpdateTimeoutException: raise GraphUpdateTimeoutException( "Timeout waiting for property change, subject %i property %s (%i)" % (subject_id, property_uri, property_id)) - self.inserts_match_function = None - self.deletes_match_function = None - self.class_to_track = None + + self.inserts_match_function = None + self.deletes_match_function = None + self.class_to_track = None # Note: The methods below call the tracker-store D-Bus API directly. This # is useful for testing this API surface, but we recommand that all regular |