diff options
| author | Sam Thursfield <sam@afuera.me.uk> | 2020-05-01 10:13:56 +0000 |
|---|---|---|
| committer | Sam Thursfield <sam@afuera.me.uk> | 2020-05-01 10:13:56 +0000 |
| commit | 79edc3ce0452073ed8aa2e2f25840faa1f8cfd1a (patch) | |
| tree | 3cb1f2b52cb866d4e81405280347cd6fe9015631 /tests/functional-tests | |
| parent | a0ba5a635a33b07d090d7e76b75f2c585bc2032e (diff) | |
| parent | 0a862d417e14451c39fec9c18ad099a548b12061 (diff) | |
| download | tracker-79edc3ce0452073ed8aa2e2f25840faa1f8cfd1a.tar.gz | |
Merge branch 'sam/debug-more' into 'master'
Logging and test cleanups
See merge request GNOME/tracker!225
Diffstat (limited to 'tests/functional-tests')
| -rw-r--r-- | tests/functional-tests/ipc/meson.build | 1 | ||||
| -rw-r--r-- | tests/functional-tests/ipc/test-bus-query-cancellation.c | 10 | ||||
| -rw-r--r-- | tests/functional-tests/ontology-changes.py | 2 |
3 files changed, 2 insertions, 11 deletions
diff --git a/tests/functional-tests/ipc/meson.build b/tests/functional-tests/ipc/meson.build index bf7728eeb..fd8a58cbc 100644 --- a/tests/functional-tests/ipc/meson.build +++ b/tests/functional-tests/ipc/meson.build @@ -3,7 +3,6 @@ functional_ipc_test_c_args = [ ] test_env.set('LANG', 'en_GB.utf-8') -test_env.set('TRACKER_DB_ONTOLOGIES_DIR', tracker_uninstalled_nepomuk_ontologies_dir) test_env.set('TRACKER_LANGUAGE_STOP_WORDS_DIR', tracker_uninstalled_stop_words_dir) bus_query_cancellation_test = executable('test-bus-query-cancellation', diff --git a/tests/functional-tests/ipc/test-bus-query-cancellation.c b/tests/functional-tests/ipc/test-bus-query-cancellation.c index def7abdaf..65997b06c 100644 --- a/tests/functional-tests/ipc/test-bus-query-cancellation.c +++ b/tests/functional-tests/ipc/test-bus-query-cancellation.c @@ -176,18 +176,8 @@ main (gint argc, gchar **argv) setlocale (LC_ALL, ""); - g_setenv ("TRACKER_DB_ONTOLOGIES_DIR", TEST_ONTOLOGIES_DIR, TRUE); - g_test_init (&argc, &argv, NULL); - /* g_test_init() enables verbose logging by default, but Tracker is too - * verbose. To make the logs managable, we hide DEBUG and INFO messages - * unless TRACKER_TESTS_VERBOSE is set. - */ - if (! g_getenv ("TRACKER_TESTS_VERBOSE")) { - g_log_set_handler ("Tracker", G_LOG_LEVEL_DEBUG | G_LOG_LEVEL_INFO, g_log_default_handler, NULL); - } - g_test_add_func ("/libtracker-sparql/tracker/gb737023", test_tracker_sparql_gb737023); diff --git a/tests/functional-tests/ontology-changes.py b/tests/functional-tests/ontology-changes.py index 8ccb662ab..8a4b5491f 100644 --- a/tests/functional-tests/ontology-changes.py +++ b/tests/functional-tests/ontology-changes.py @@ -100,6 +100,8 @@ class OntologyChangeTestTemplate (ut.TestCase): self.validate_status() + conn2.close() + def set_ontology_dirs(self): """ Implement this method in the subclass setting values for: |