[tracker-miners/sam/functional-tests-shared: 14/15] functional-tests: Remove the DCONF_MINER_SCHEMA constant



commit 855a397622bd6ef7cc4ed29bde5927216d20bc1c
Author: Sam Thursfield <sam afuera me uk>
Date:   Wed Aug 21 23:38:31 2019 +0100

    functional-tests: Remove the DCONF_MINER_SCHEMA constant
    
    This name is unlikely to change in the near future. And search+replace
    is not difficult if it does need to change.

 tests/functional-tests/410-extractor-decorator.py | 2 +-
 tests/functional-tests/applicationstest.py        | 2 +-
 tests/functional-tests/configuration.py           | 2 --
 tests/functional-tests/minertest.py               | 2 +-
 tests/functional-tests/writebacktest.py           | 2 +-
 5 files changed, 4 insertions(+), 6 deletions(-)
---
diff --git a/tests/functional-tests/410-extractor-decorator.py 
b/tests/functional-tests/410-extractor-decorator.py
index 420a12afb..281535dd0 100755
--- a/tests/functional-tests/410-extractor-decorator.py
+++ b/tests/functional-tests/410-extractor-decorator.py
@@ -53,7 +53,7 @@ class ExtractorDecoratorTest(ut.TestCase):
         self.datadir = cfg.create_monitored_test_dir()
 
         config = {
-            cfg.DCONF_MINER_SCHEMA: {
+            'org.freedesktop.Tracker.Miner.Files': {
                 'enable-writeback': GLib.Variant.new_boolean(False),
                 'index-recursive-directories': GLib.Variant.new_strv([]),
                 'index-single-directories': GLib.Variant.new_strv([self.datadir]),
diff --git a/tests/functional-tests/applicationstest.py b/tests/functional-tests/applicationstest.py
index 12b38909c..efb481a84 100644
--- a/tests/functional-tests/applicationstest.py
+++ b/tests/functional-tests/applicationstest.py
@@ -88,7 +88,7 @@ class CommonTrackerApplicationTest (ut.TestCase):
         index_dirs = [self.workdir]
 
         CONF_OPTIONS = {
-            cfg.DCONF_MINER_SCHEMA: {
+            'org.freedesktop.Tracker.Miner.Files': {
                 'index-recursive-directories': GLib.Variant.new_strv(index_dirs),
                 'index-single-directories': GLib.Variant.new_strv([]),
                 'index-optical-discs': GLib.Variant.new_boolean(False),
diff --git a/tests/functional-tests/configuration.py b/tests/functional-tests/configuration.py
index 8e6b0fd12..a4e05918d 100644
--- a/tests/functional-tests/configuration.py
+++ b/tests/functional-tests/configuration.py
@@ -36,8 +36,6 @@ with open(os.environ['TRACKER_FUNCTIONAL_TEST_CONFIG']) as f:
     config = json.load(f)
 
 
-DCONF_MINER_SCHEMA = "org.freedesktop.Tracker.Miner.Files"
-
 TOP_BUILDDIR = os.environ['TRACKER_FUNCTIONAL_TEST_BUILD_DIR']
 DATADIR = config['RAW_DATAROOT_DIR']
 
diff --git a/tests/functional-tests/minertest.py b/tests/functional-tests/minertest.py
index 9dcb3c528..27a4446f1 100644
--- a/tests/functional-tests/minertest.py
+++ b/tests/functional-tests/minertest.py
@@ -64,7 +64,7 @@ class CommonTrackerMinerTest (ut.TestCase):
         )
 
         config = {
-            cfg.DCONF_MINER_SCHEMA: {
+            'org.freedesktop.Tracker.Miner.Files': {
                 'index-recursive-directories': GLib.Variant.new_strv([self.indexed_dir]),
                 'index-single-directories': GLib.Variant.new_strv([]),
                 'index-optical-discs': GLib.Variant.new_boolean(False),
diff --git a/tests/functional-tests/writebacktest.py b/tests/functional-tests/writebacktest.py
index ec65477f5..d8feb7d42 100644
--- a/tests/functional-tests/writebacktest.py
+++ b/tests/functional-tests/writebacktest.py
@@ -48,7 +48,7 @@ class CommonTrackerWritebackTest (ut.TestCase):
         index_dirs = [self.workdir]
 
         CONF_OPTIONS = {
-            cfg.DCONF_MINER_SCHEMA: {
+            'org.freedesktop.Tracker.Miner.Files': {
                 'index-recursive-directories': GLib.Variant.new_strv(index_dirs),
                 'index-single-directories': GLib.Variant.new_strv([]),
                 'index-optical-discs': GLib.Variant.new_boolean(False),


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