[tracker] functional-tests: Fixed distcheck issue with dconf

[Martyn James Russell <mr src gnome org>]

commit 344b8359f2e19794d7887ff5a83013c55d5989d6
Author: Martyn Russell <martyn lanedo com>
Date:   Mon Apr 4 11:56:59 2011 +0100

    functional-tests: Fixed distcheck issue with dconf

 tests/functional-tests/Makefile.am            |   10 +++-------
 tests/functional-tests/common/utils/dconf.py  |    4 ++--
 tests/functional-tests/common/utils/system.py |    2 +-
 tests/functional-tests/tracker-test           |    1 +
 tests/functional-tests/trackertest.dconf.in   |    1 -
 5 files changed, 7 insertions(+), 11 deletions(-)
---
diff --git a/tests/functional-tests/Makefile.am b/tests/functional-tests/Makefile.am
index e511f13..2afef55 100644
--- a/tests/functional-tests/Makefile.am
+++ b/tests/functional-tests/Makefile.am
@@ -24,11 +24,7 @@ config_SCRIPTS += \
 endif
 
 dconfdir = $(sysconfdir)/dconf/profile
-dconf_DATA = \
-	trackertest
-
-trackertest: trackertest.dconf.in
-	cp trackertest.dconf.in trackertest
+dconf_DATA = tracker-test
 
 standard_tests = \
 	01-insertion.py \
@@ -113,8 +109,8 @@ functional-test-slow: ${slow_tests}
 
 EXTRA_DIST = \
 	$(config_SCRIPTS) \
-	create-tests-xml.py \
-	trackertest
+	$(dconf_DATA) \
+	create-tests-xml.py
 
 if HAVE_MAEMO
 CLEANFILES = \
diff --git a/tests/functional-tests/common/utils/dconf.py b/tests/functional-tests/common/utils/dconf.py
index 33de837..b0188dc 100644
--- a/tests/functional-tests/common/utils/dconf.py
+++ b/tests/functional-tests/common/utils/dconf.py
@@ -20,7 +20,7 @@ class DConfClient:
 
     def reset (self):
         profile = os.environ ["DCONF_PROFILE"]
-        assert profile == "trackertest"
+        assert profile == "tracker-test"
         # XDG_CONFIG_HOME is useless
         dconf_db = os.path.join (os.environ ["HOME"], ".config", "dconf", profile)
         if os.path.exists (dconf_db):
@@ -32,7 +32,7 @@ if __name__ == "__main__":
 
 
     SCHEMA_MINER = "org.freedesktop.Tracker.Miner.Files"
-    os.environ ["DCONF_PROFILE"] = "trackertest"
+    os.environ ["DCONF_PROFILE"] = "tracker-test"
 
     dconf = DConfClient ()
     value = dconf.read (DConfClient.SCHEMA_MINER, "throttle")
diff --git a/tests/functional-tests/common/utils/system.py b/tests/functional-tests/common/utils/system.py
index e4f3d4a..9823af3 100644
--- a/tests/functional-tests/common/utils/system.py
+++ b/tests/functional-tests/common/utils/system.py
@@ -23,7 +23,7 @@ TEST_ENV_DIRS =  { "XDG_DATA_HOME" : os.path.join (cfg.TEST_TMP_DIR, "xdg-data-h
 
 TEST_ENV_VARS = {  "TRACKER_DISABLE_MEEGOTOUCH_LOCALE": "",
                    "LC_COLLATE": "en_GB.utf8",
-                   "DCONF_PROFILE": "trackertest"}
+                   "DCONF_PROFILE": "tracker-test"}
 
 EXTRA_DIRS = [os.path.join (cfg.TEST_TMP_DIR, "xdg-data-home", "tracker"),
               os.path.join (cfg.TEST_TMP_DIR, "xdg-cache-home", "tracker")]
diff --git a/tests/functional-tests/tracker-test b/tests/functional-tests/tracker-test
new file mode 100644
index 0000000..951d386
--- /dev/null
+++ b/tests/functional-tests/tracker-test
@@ -0,0 +1 @@
+tracker-test