[tracker] functional-tests: Fix dconf profile name

[Jürg Billeter <juergbi src gnome org>]

commit 9a6cc0950ad68e7f602e6a7e3de3c26a51ba74be
Author: Jürg Billeter <j bitron ch>
Date:   Fri May 13 14:21:03 2011 +0200

    functional-tests: Fix dconf profile name
    
    It is used as component of a D-Bus object path, which does not allow
    hyphens.

 tests/functional-tests/.gitignore             |    1 -
 tests/functional-tests/Makefile.am            |    2 +-
 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            |    1 +
 6 files changed, 5 insertions(+), 6 deletions(-)
---
diff --git a/tests/functional-tests/.gitignore b/tests/functional-tests/.gitignore
index bb4a859..06e11ff 100644
--- a/tests/functional-tests/.gitignore
+++ b/tests/functional-tests/.gitignore
@@ -4,4 +4,3 @@ force-sqlite-misused.sh
 helper-test-data.sh
 tests.xml
 tracker-tests.aegis
-trackertest
diff --git a/tests/functional-tests/Makefile.am b/tests/functional-tests/Makefile.am
index 2afef55..157f52c 100644
--- a/tests/functional-tests/Makefile.am
+++ b/tests/functional-tests/Makefile.am
@@ -24,7 +24,7 @@ config_SCRIPTS += \
 endif
 
 dconfdir = $(sysconfdir)/dconf/profile
-dconf_DATA = tracker-test
+dconf_DATA = trackertest
 
 standard_tests = \
 	01-insertion.py \
diff --git a/tests/functional-tests/common/utils/dconf.py b/tests/functional-tests/common/utils/dconf.py
index b0188dc..33de837 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 == "tracker-test"
+        assert profile == "trackertest"
         # 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"] = "tracker-test"
+    os.environ ["DCONF_PROFILE"] = "trackertest"
 
     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 9823af3..e4f3d4a 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": "tracker-test"}
+                   "DCONF_PROFILE": "trackertest"}
 
 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/trackertest b/tests/functional-tests/trackertest
new file mode 100644
index 0000000..2ecddfa
--- /dev/null
+++ b/tests/functional-tests/trackertest
@@ -0,0 +1 @@
+trackertest