[tracker/gsettings-remaining-bits] functional-tests: Miner tests take configuration from a dconf test profile

[Ivan Frade <ifrade src gnome org>]

commit a8e736de03ba847be9069176c4cda7d621fa282b
Author: Ivan Frade <ivan frade nokia com>
Date:   Tue Mar 22 13:30:26 2011 +0200

    functional-tests: Miner tests take configuration from a dconf test profile

 .../common/utils/configuration.py.in               |    2 +-
 tests/functional-tests/common/utils/minertest.py   |    3 ++-
 tests/functional-tests/common/utils/system.py      |    6 ------
 3 files changed, 3 insertions(+), 8 deletions(-)
---
diff --git a/tests/functional-tests/common/utils/configuration.py.in b/tests/functional-tests/common/utils/configuration.py.in
index 8b97cff..d3b12c5 100644
--- a/tests/functional-tests/common/utils/configuration.py.in
+++ b/tests/functional-tests/common/utils/configuration.py.in
@@ -46,7 +46,7 @@ TRACKER_EXTRACT_IFACE = "org.freedesktop.Tracker1.Extract"
 WRITEBACK_BUSNAME = "org.freedesktop.Tracker1.Writeback"
 
 
-DCONF_MINER_SCHEMA = "org.freedesktop.Tracker.Miner.FileSystem"
+DCONF_MINER_SCHEMA = "org.freedesktop.Tracker.Miner.Files"
 
 def expandvars (variable):
     # Note: the order matters!
diff --git a/tests/functional-tests/common/utils/minertest.py b/tests/functional-tests/common/utils/minertest.py
index 07bda9e..7e2750b 100644
--- a/tests/functional-tests/common/utils/minertest.py
+++ b/tests/functional-tests/common/utils/minertest.py
@@ -37,7 +37,8 @@ def uri (filename):
 DEFAULT_TEXT = "Some stupid content, to have a test file"
 
 CONF_OPTIONS = [
-    (cfg.DCONF_MINER_SCHEMA, "index-recursive-directories", "['$HOME/test-monitored']"),
+    (cfg.DCONF_MINER_SCHEMA, "index-recursive-directories", [os.path.join (BASEDIR, "test-monitored")]),
+    (cfg.DCONF_MINER_SCHEMA, "index-single-directories", "[]"),
     (cfg.DCONF_MINER_SCHEMA, "throttle", 5)
     ]
 
diff --git a/tests/functional-tests/common/utils/system.py b/tests/functional-tests/common/utils/system.py
index dc33d2f..74065f4 100644
--- a/tests/functional-tests/common/utils/system.py
+++ b/tests/functional-tests/common/utils/system.py
@@ -28,9 +28,6 @@ TEST_ENV_VARS = {  "TRACKER_DISABLE_MEEGOTOUCH_LOCALE": "",
 EXTRA_DIRS = [os.path.join (cfg.TEST_TMP_DIR, "xdg-data-home", "tracker"),
               os.path.join (cfg.TEST_TMP_DIR, "xdg-cache-home", "tracker")]
 
-# This variable is not in the dictionary because not all tests need to modify it!
-XDG_CONFIG_HOME_DIR = os.path.join (cfg.TEST_TMP_DIR, "xdg-config-home")
-
 REASONABLE_TIMEOUT = 30
 
 class UnableToBootException (Exception):
@@ -350,9 +347,6 @@ class TrackerSystemAbstraction:
             if os.environ.has_key (var):
                 del os.environ [var]
 
-        if (os.environ.has_key ("XDG_CONFIG_HOME")):
-            del os.environ ["XDG_CONFIG_HOME"]
-
         if (os.environ.has_key ("TRACKER_DB_ONTOLOGIES_DIR")):
             del os.environ ["TRACKER_DB_ONTOLOGIES_DIR"]