Use a dummy relationships file for Tp tests.

The main purposes are to prevent the key-file backend from reading in the user's
relationships.ini file and to avoid the inconsistency that could entail.

Fixes bgo#632163.

diff --git a/NEWS b/NEWS
index 49a6a71..171fbb2 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -13,6 +13,8 @@ Bugs fixed:
 * Bug 631864 — Crash when empathy disconnects
 * 632096 - build failure: contact-retrieval.o: undefined reference to symbol
   'gee_abstract_collection_add'
+* Bug 632163 — Folks key-file backend needs a way to point to a specific
+  .ini file
 
 Overview of changes from libfolks 0.1.17 to libfolks 0.3.0
 ==========================================================

diff --git a/tests/telepathy/Makefile.am b/tests/telepathy/Makefile.am
index a6ad2c5..c257088 100644 (file)
--- a/tests/telepathy/Makefile.am
+++ b/tests/telepathy/Makefile.am
@@ -48,6 +48,8 @@ noinst_PROGRAMS = \
        individual-properties \
        $(NULL)
 
+TESTS_ENVIRONMENT = \
+       FOLKS_BACKEND_KEY_FILE_PATH=$(srcdir)/data/relationships-empty.ini
 TESTS = $(addprefix test-,$(noinst_PROGRAMS))
 
 persona_store_capabilities_SOURCES = \

diff --git a/tests/telepathy/data/relationships-empty.ini b/tests/telepathy/data/relationships-empty.ini
new file mode 100644 (file)
index 0000000..e69de29