[next] telepathy-glib: log-store-pidin: stop relying on TPL_TEST_LOG_DIR for tests

[Simon McVittie]

Module: telepathy-glib
Branch: next
Commit: d0a4ccf8b2fae5c668618d293332935e8d60b9c3
URL:    http://cgit.freedesktop.org/telepathy/telepathy-glib/commit/?id=d0a4ccf8b2fae5c668618d293332935e8d60b9c3

Author: Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
Date:   Wed Jan  8 12:45:24 2014 +0100

log-store-pidin: stop relying on TPL_TEST_LOG_DIR for tests

Tweaking $HOME in tests make the code more symetric and simpler.

---

 telepathy-logger/log-store-pidgin.c                         |   11 +++++------
 tests/logger/dbus/Makefile.am                               |    1 +
 tests/logger/dbus/test-tpl-log-store-pidgin.c               |    4 ++--
 .../user at host/user2 at host2/2010-04-29.140346+0100BST.html    |    0
 .../icq/12345678/87654321/2010-02-06.130032+0000GMT.html    |  Bin 938 -> 938 bytes
 .../icq/12345678/87654321/2010-02-07.130033+0000GMT.html    |    0
 .../icq/12345678/87654321/2010-02-08.130034+0000GMT.html    |    0
 .../icq/12345678/87654321/2010-02-08.134023+0000GMT.html    |    0
 .../#telepathy.chat/2010-11-30.124947+0000GMT.html          |    0
 .../.system/2010-12-10.162531+0000GMT.txt                   |    0
 .../2010-04-12.122703+0100BST.html                          |    0
 .../2010-04-29.140846+0100BST.html                          |    0
 .../user2 at collabora.co.uk/2010-12-10.162702+0000GMT.txt     |    0
 .../user5 at collabora.co.uk/2010-01-10.000101+0000GMT.txt     |    0
 .../user5 at collabora.co.uk/2010-01-11.000101+0000GMT.txt     |    0
 .../user5 at collabora.co.uk/2010-01-14.000101+0000GMT.txt     |    0
 16 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/telepathy-logger/log-store-pidgin.c b/telepathy-logger/log-store-pidgin.c
index c2c12cf..034a71b 100644
--- a/telepathy-logger/log-store-pidgin.c
+++ b/telepathy-logger/log-store-pidgin.c
@@ -207,12 +207,11 @@ log_store_pidgin_get_basedir (TplLogStorePidgin *self)
     {
       gchar *dir;
 
-      if (self->priv->test_mode && g_getenv ("TPL_TEST_LOG_DIR") != NULL)
-        dir = g_build_path (G_DIR_SEPARATOR_S, g_getenv ("TPL_TEST_LOG_DIR"),
-            "purple", NULL);
-      else
-        dir = g_build_path (G_DIR_SEPARATOR_S, g_get_home_dir (), ".purple",
-            "logs", NULL);
+      /* This is fine with tests as we depend on GLib 2.36 which is now using
+       * $HOME to find the home dir. */
+      dir = g_build_path (G_DIR_SEPARATOR_S, g_get_home_dir (), ".purple",
+          "logs", NULL);
+
       log_store_pidgin_set_basedir (self, dir);
 
       g_free (dir);
diff --git a/tests/logger/dbus/Makefile.am b/tests/logger/dbus/Makefile.am
index cb84655..5ac42a5 100644
--- a/tests/logger/dbus/Makefile.am
+++ b/tests/logger/dbus/Makefile.am
@@ -43,6 +43,7 @@ AM_TESTS_ENVIRONMENT = \
     abs_top_builddir=@abs_top_builddir@				\
     TPL_TEST_MODE=true						\
     TPL_TEST_LOG_DIR=@abs_top_srcdir@/tests/logger/logs		\
+    HOME=@abs_top_srcdir@/tests/logger/logs		\
     GSETTINGS_SCHEMA_DIR=@abs_srcdir@/data			\
     XDG_DATA_HOME=@abs_top_builddir@/tests/logger/logs		\
     XDG_DATA_DIRS=@abs_srcdir@					\
diff --git a/tests/logger/dbus/test-tpl-log-store-pidgin.c b/tests/logger/dbus/test-tpl-log-store-pidgin.c
index 4da68b2..ecd1cf6 100644
--- a/tests/logger/dbus/test-tpl-log-store-pidgin.c
+++ b/tests/logger/dbus/test-tpl-log-store-pidgin.c
@@ -171,8 +171,8 @@ setup (PidginTestCaseFixture* fixture,
   fixture->main_loop = g_main_loop_new (NULL, FALSE);
   g_assert (fixture->main_loop != NULL);
 
-  fixture->basedir = g_build_path (G_DIR_SEPARATOR_S,
-      g_getenv ("TPL_TEST_LOG_DIR"), "purple", NULL);
+  fixture->basedir = g_build_path (G_DIR_SEPARATOR_S, g_get_home_dir (),
+      ".purple", "logs", NULL);
   DEBUG ("basedir is %s", fixture->basedir);
 
   fixture->store = g_object_new (TPL_TYPE_LOG_STORE_PIDGIN,
diff --git a/tests/logger/logs/purple/bonjour/user at host/user2 at host2/2010-04-29.140346+0100BST.html b/tests/logger/logs/.purple/logs/bonjour/user at host/user2 at host2/2010-04-29.140346+0100BST.html
similarity index 100%
rename from tests/logger/logs/purple/bonjour/user at host/user2 at host2/2010-04-29.140346+0100BST.html
rename to tests/logger/logs/.purple/logs/bonjour/user at host/user2 at host2/2010-04-29.140346+0100BST.html
diff --git a/tests/logger/logs/purple/icq/12345678/87654321/2010-02-06.130032+0000GMT.html b/tests/logger/logs/.purple/logs/icq/12345678/87654321/2010-02-06.130032+0000GMT.html
similarity index 100%
rename from tests/logger/logs/purple/icq/12345678/87654321/2010-02-06.130032+0000GMT.html
rename to tests/logger/logs/.purple/logs/icq/12345678/87654321/2010-02-06.130032+0000GMT.html
diff --git a/tests/logger/logs/purple/icq/12345678/87654321/2010-02-07.130033+0000GMT.html b/tests/logger/logs/.purple/logs/icq/12345678/87654321/2010-02-07.130033+0000GMT.html
similarity index 100%
rename from tests/logger/logs/purple/icq/12345678/87654321/2010-02-07.130033+0000GMT.html
rename to tests/logger/logs/.purple/logs/icq/12345678/87654321/2010-02-07.130033+0000GMT.html
diff --git a/tests/logger/logs/purple/icq/12345678/87654321/2010-02-08.130034+0000GMT.html b/tests/logger/logs/.purple/logs/icq/12345678/87654321/2010-02-08.130034+0000GMT.html
similarity index 100%
rename from tests/logger/logs/purple/icq/12345678/87654321/2010-02-08.130034+0000GMT.html
rename to tests/logger/logs/.purple/logs/icq/12345678/87654321/2010-02-08.130034+0000GMT.html
diff --git a/tests/logger/logs/purple/icq/12345678/87654321/2010-02-08.134023+0000GMT.html b/tests/logger/logs/.purple/logs/icq/12345678/87654321/2010-02-08.134023+0000GMT.html
similarity index 100%
rename from tests/logger/logs/purple/icq/12345678/87654321/2010-02-08.134023+0000GMT.html
rename to tests/logger/logs/.purple/logs/icq/12345678/87654321/2010-02-08.134023+0000GMT.html
diff --git a/tests/logger/logs/purple/irc/user at irc.freenode.net/#telepathy.chat/2010-11-30.124947+0000GMT.html b/tests/logger/logs/.purple/logs/irc/user at irc.freenode.net/#telepathy.chat/2010-11-30.124947+0000GMT.html
similarity index 100%
rename from tests/logger/logs/purple/irc/user at irc.freenode.net/#telepathy.chat/2010-11-30.124947+0000GMT.html
rename to tests/logger/logs/.purple/logs/irc/user at irc.freenode.net/#telepathy.chat/2010-11-30.124947+0000GMT.html
diff --git a/tests/logger/logs/purple/jabber/user at collabora.co.uk/.system/2010-12-10.162531+0000GMT.txt b/tests/logger/logs/.purple/logs/jabber/user at collabora.co.uk/.system/2010-12-10.162531+0000GMT.txt
similarity index 100%
rename from tests/logger/logs/purple/jabber/user at collabora.co.uk/.system/2010-12-10.162531+0000GMT.txt
rename to tests/logger/logs/.purple/logs/jabber/user at collabora.co.uk/.system/2010-12-10.162531+0000GMT.txt
diff --git a/tests/logger/logs/purple/jabber/user at collabora.co.uk/test at conference.collabora.co.uk.chat/2010-04-12.122703+0100BST.html b/tests/logger/logs/.purple/logs/jabber/user at collabora.co.uk/test at conference.collabora.co.uk.chat/2010-04-12.122703+0100BST.html
similarity index 100%
rename from tests/logger/logs/purple/jabber/user at collabora.co.uk/test at conference.collabora.co.uk.chat/2010-04-12.122703+0100BST.html
rename to tests/logger/logs/.purple/logs/jabber/user at collabora.co.uk/test at conference.collabora.co.uk.chat/2010-04-12.122703+0100BST.html
diff --git a/tests/logger/logs/purple/jabber/user at collabora.co.uk/test at conference.collabora.co.uk.chat/2010-04-29.140846+0100BST.html b/tests/logger/logs/.purple/logs/jabber/user at collabora.co.uk/test at conference.collabora.co.uk.chat/2010-04-29.140846+0100BST.html
similarity index 100%
rename from tests/logger/logs/purple/jabber/user at collabora.co.uk/test at conference.collabora.co.uk.chat/2010-04-29.140846+0100BST.html
rename to tests/logger/logs/.purple/logs/jabber/user at collabora.co.uk/test at conference.collabora.co.uk.chat/2010-04-29.140846+0100BST.html
diff --git a/tests/logger/logs/purple/jabber/user at collabora.co.uk/user2 at collabora.co.uk/2010-12-10.162702+0000GMT.txt b/tests/logger/logs/.purple/logs/jabber/user at collabora.co.uk/user2 at collabora.co.uk/2010-12-10.162702+0000GMT.txt
similarity index 100%
rename from tests/logger/logs/purple/jabber/user at collabora.co.uk/user2 at collabora.co.uk/2010-12-10.162702+0000GMT.txt
rename to tests/logger/logs/.purple/logs/jabber/user at collabora.co.uk/user2 at collabora.co.uk/2010-12-10.162702+0000GMT.txt
diff --git a/tests/logger/logs/purple/jabber/user at collabora.co.uk/user5 at collabora.co.uk/2010-01-10.000101+0000GMT.txt b/tests/logger/logs/.purple/logs/jabber/user at collabora.co.uk/user5 at collabora.co.uk/2010-01-10.000101+0000GMT.txt
similarity index 100%
rename from tests/logger/logs/purple/jabber/user at collabora.co.uk/user5 at collabora.co.uk/2010-01-10.000101+0000GMT.txt
rename to tests/logger/logs/.purple/logs/jabber/user at collabora.co.uk/user5 at collabora.co.uk/2010-01-10.000101+0000GMT.txt
diff --git a/tests/logger/logs/purple/jabber/user at collabora.co.uk/user5 at collabora.co.uk/2010-01-11.000101+0000GMT.txt b/tests/logger/logs/.purple/logs/jabber/user at collabora.co.uk/user5 at collabora.co.uk/2010-01-11.000101+0000GMT.txt
similarity index 100%
rename from tests/logger/logs/purple/jabber/user at collabora.co.uk/user5 at collabora.co.uk/2010-01-11.000101+0000GMT.txt
rename to tests/logger/logs/.purple/logs/jabber/user at collabora.co.uk/user5 at collabora.co.uk/2010-01-11.000101+0000GMT.txt
diff --git a/tests/logger/logs/purple/jabber/user at collabora.co.uk/user5 at collabora.co.uk/2010-01-14.000101+0000GMT.txt b/tests/logger/logs/.purple/logs/jabber/user at collabora.co.uk/user5 at collabora.co.uk/2010-01-14.000101+0000GMT.txt
similarity index 100%
rename from tests/logger/logs/purple/jabber/user at collabora.co.uk/user5 at collabora.co.uk/2010-01-14.000101+0000GMT.txt
rename to tests/logger/logs/.purple/logs/jabber/user at collabora.co.uk/user5 at collabora.co.uk/2010-01-14.000101+0000GMT.txt