[tracker: 21/21] Merge branch 'azzaronea/fix-issue-67'



commit 58706035a21e080256ba6169704e3239d3725d9c
Merge: bd00a0edb 5f484f892
Author: Carlos Garnacho <carlosg gnome org>
Date:   Sun Feb 17 21:38:33 2019 +0100

    Merge branch 'azzaronea/fix-issue-67'

 src/libtracker-data/tracker-data-manager.c         |   1 +
 src/libtracker-data/tracker-db-interface-sqlite.c  |   2 +
 src/libtracker-data/tracker-db-journal.c           |   3 +-
 src/libtracker-data/tracker-sparql-grammar.h       |   2 +-
 src/libtracker-data/tracker-sparql.c               |   6 +-
 src/libtracker-data/tracker-turtle-reader.vala     |  21 +-
 src/libtracker-direct/tracker-direct.c             |   1 +
 src/libtracker-miner/tracker-monitor.c             |   1 +
 tests/libtracker-common/tracker-date-time-test.c   |   7 +
 tests/libtracker-common/tracker-file-utils-test.c  |   7 +-
 tests/libtracker-common/tracker-type-utils-test.c  |   2 +
 tests/libtracker-data/tracker-backup-test.c        |   2 +
 .../libtracker-data/tracker-ontology-change-test.c |   1 +
 .../libtracker-miner/tracker-file-notifier-test.c  |   5 +-
 tests/libtracker-miner/tracker-miner-fs-test.c     | 376 ++++++++++++++++-----
 .../libtracker-miner/tracker-priority-queue-test.c |  10 +
 tests/libtracker-sparql/tracker-resource-test.c    |   2 +-
 17 files changed, 350 insertions(+), 99 deletions(-)
---
diff --cc tests/libtracker-common/tracker-file-utils-test.c
index 5bf1c9ed4,2e2f58f97..66f9739fa
--- a/tests/libtracker-common/tracker-file-utils-test.c
+++ b/tests/libtracker-common/tracker-file-utils-test.c
@@@ -215,9 -219,8 +219,10 @@@ test_path_evaluate_name (void
  
        result = tracker_path_evaluate_name (tracker_test_helpers_get_nonutf8 ());
        g_assert_cmpstr (result, ==, tracker_test_helpers_get_nonutf8 ());
+       g_free (result);
  
 +      g_free (home);
 +      g_free (pwd);
        g_unsetenv ("TEST_TRACKER_DIR");
  }
  
diff --cc tests/libtracker-miner/tracker-priority-queue-test.c
index a32d0fb81,893ca14f9..2d5c6333c
--- a/tests/libtracker-miner/tracker-priority-queue-test.c
+++ b/tests/libtracker-miner/tracker-priority-queue-test.c
@@@ -130,6 -130,11 +130,11 @@@ test_priority_queue_find (void
          g_assert_cmpstr (result, !=, NULL);
          g_assert_cmpint (priority, ==, 10);
  
+         while (!tracker_priority_queue_is_empty (queue)) {
 -            gchar *text = (gchar *) tracker_priority_queue_pop (queue, NULL);
 -            g_free (text);
++                gchar *text = (gchar *) tracker_priority_queue_pop (queue, NULL);
++                g_free (text);
+         }
+ 
          tracker_priority_queue_unref (queue);
  }
  
@@@ -157,6 -162,11 +162,11 @@@ test_priority_queue_foreach (void
  
          g_assert_cmpint (counter, ==, 3);
  
+         while (!tracker_priority_queue_is_empty (queue)) {
 -            gchar *text = (gchar *) tracker_priority_queue_pop (queue, NULL);
 -            g_free (text);
++                gchar *text = (gchar *) tracker_priority_queue_pop (queue, NULL);
++                g_free (text);
+         }
+ 
          tracker_priority_queue_unref (queue);
  }
  


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]