From f0833ca31555103732a59b1a49a653673be694ba Mon Sep 17 00:00:00 2001
From: "Dirk-Jan C. Binnema" <djcb@djcbsoftware.nl>
Date: Thu, 21 Jul 2011 00:58:40 +0300
Subject: [PATCH] * some more timezone fixes for the unit tests

---
 src/tests/test-mu-cmd-cfind.c |  9 +++++++--
 src/tests/test-mu-common.c    | 17 +++++++++++++++++
 src/tests/test-mu-common.h    |  2 ++
 src/tests/test-mu-query.c     | 15 ---------------
 4 files changed, 26 insertions(+), 17 deletions(-)

diff --git a/src/tests/test-mu-cmd-cfind.c b/src/tests/test-mu-cmd-cfind.c
index 12ca455d..df399e95 100644
--- a/src/tests/test-mu-cmd-cfind.c
+++ b/src/tests/test-mu-cmd-cfind.c
@@ -85,10 +85,13 @@ test_mu_cfind_bbdb (void)
 	const char* frm;
 	struct tm *tmtoday;
 	time_t now;
-
+	const char *old_tz;
+	
 	muhome = fill_contacts_cache ();
 	g_assert (muhome != NULL);
-
+	
+	old_tz = set_tz ("Europe/Helsinki");
+	
 	cmdline = g_strdup_printf ("%s cfind --muhome=%s --format=bbdb "
 				   "'testmu\\.xxx?'",
 				   MU_PROGRAM, muhome);
@@ -120,6 +123,8 @@ test_mu_cfind_bbdb (void)
 	g_free (output);
 	g_free (erroutput);
 	g_free (expected);
+
+	set_tz (old_tz);
 }
 
 
diff --git a/src/tests/test-mu-common.c b/src/tests/test-mu-common.c
index 4d546eff..d8b0802c 100644
--- a/src/tests/test-mu-common.c
+++ b/src/tests/test-mu-common.c
@@ -41,6 +41,23 @@ test_mu_common_get_random_tmpdir (void)
 }
 
 
+const char*
+set_tz (const char* tz)
+{
+	static const char* oldtz;
+
+	oldtz = getenv ("TZ");
+	if (tz)
+		setenv ("TZ", tz, 1);
+	else
+		unsetenv ("TZ");
+
+	tzset ();
+	return oldtz;
+}
+
+
+
 void
 black_hole (void)
 {
diff --git a/src/tests/test-mu-common.h b/src/tests/test-mu-common.h
index 50794793..c443e50d 100644
--- a/src/tests/test-mu-common.h
+++ b/src/tests/test-mu-common.h
@@ -33,6 +33,8 @@ char* test_mu_common_get_random_tmpdir (void);
 
 void black_hole (void);
 
+const char* set_tz (const char* tz);
+
 G_END_DECLS
 
 #endif /*__TEST_MU_COMMON_H__*/
diff --git a/src/tests/test-mu-query.c b/src/tests/test-mu-query.c
index 12553193..b6a864a5 100644
--- a/src/tests/test-mu-query.c
+++ b/src/tests/test-mu-query.c
@@ -338,21 +338,6 @@ test_mu_query_wildcards (void)
 }
 
 
-static const char*
-set_tz (const char* tz)
-{
-	static const char* oldtz;
-
-	oldtz = getenv ("TZ");
-	if (tz)
-		setenv ("TZ", tz, 1);
-	else
-		unsetenv ("TZ");
-
-	tzset ();
-	return oldtz;
-}
-
 
 static void
 test_mu_query_dates_helsinki (void)