[folks/folks-0-2] Use a dummy relationships file for Tp tests.



commit 132fc6c28e559153c809018e0426dab209a24a5e
Author: Travis Reitter <travis reitter collabora co uk>
Date:   Thu Oct 14 13:18:21 2010 -0700

    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.
    
    See also bgo#632163.

 NEWS                                         |    2 ++
 tests/telepathy/Makefile.am                  |    8 ++++----
 2 files changed, 6 insertions(+), 4 deletions(-)
---
diff --git a/NEWS b/NEWS
index 312e91b..aa436da 100644
--- a/NEWS
+++ b/NEWS
@@ -6,6 +6,8 @@ Bugs fixed:
 * Bug 631864 â?? Crash when empathy disconnects
 * Bug 632564 â?? assertion `EMPATHY_IS_CONTACT (contact)' failed in
   individual_store_contact_sort
+* 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.2.0
 ==========================================================
diff --git a/tests/telepathy/Makefile.am b/tests/telepathy/Makefile.am
index 258dc00..b4d310f 100644
--- a/tests/telepathy/Makefile.am
+++ b/tests/telepathy/Makefile.am
@@ -32,14 +32,14 @@ VALAFLAGS += \
 	--pkg tp-test-contactlist \
 	$(NULL)
 
-TESTS = \
-	test-contact-retrieval \
-	$(NULL)
-
 noinst_PROGRAMS = \
 	contact-retrieval \
 	$(NULL)
 
+TESTS_ENVIRONMENT = \
+	FOLKS_BACKEND_KEY_FILE_PATH=$(srcdir)/data/relationships-empty.ini
+TESTS = $(addprefix test-,$(noinst_PROGRAMS))
+
 contact_retrieval_SOURCES = \
 	test-case.vala \
 	contact-retrieval.vala \
diff --git a/tests/telepathy/data/relationships-empty.ini b/tests/telepathy/data/relationships-empty.ini
new file mode 100644
index 0000000..e69de29



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