[next] telepathy-glib: Logger tests: remove TpDebugSender and timestamping
Simon McVittie
smcv at kemper.freedesktop.org
Wed Mar 19 13:00:51 PDT 2014
Module: telepathy-glib
Branch: next
Commit: 16004c6dad3523aa10cc64bdb29796a2c0c87094
URL: http://cgit.freedesktop.org/telepathy/telepathy-glib/commit/?id=16004c6dad3523aa10cc64bdb29796a2c0c87094
Author: Simon McVittie <simon.mcvittie at collabora.co.uk>
Date: Tue Mar 18 17:30:35 2014 +0000
Logger tests: remove TpDebugSender and timestamping
I'm not sure why the TpDebugSender is even there; a log file is much
more useful for regression tests.
Timestamping might potentially be useful, but it can be part of
tp_tests_init() if we ever need it.
Reviewed-by: Xavier Claessens
---
tests/logger/dbus/test-log-manager.c | 78 +------------------------
tests/logger/dbus/test-tpl-log-store-pidgin.c | 76 +-----------------------
2 files changed, 2 insertions(+), 152 deletions(-)
diff --git a/tests/logger/dbus/test-log-manager.c b/tests/logger/dbus/test-log-manager.c
index 0534e69..907c124 100644
--- a/tests/logger/dbus/test-log-manager.c
+++ b/tests/logger/dbus/test-log-manager.c
@@ -40,60 +40,6 @@ typedef struct
TplLogManager *manager;
} TestCaseFixture;
-
-
-static TpDebugSender *debug_sender = NULL;
-static gboolean stamp_logs = FALSE;
-
-
-static void
-log_to_debug_sender (const gchar *log_domain,
- GLogLevelFlags log_level,
- const gchar *string)
-{
- GTimeVal now;
-
- g_return_if_fail (TP_IS_DEBUG_SENDER (debug_sender));
-
- g_get_current_time (&now);
-
- tp_debug_sender_add_message (debug_sender, &now, log_domain, log_level,
- string);
-}
-
-
-static void
-log_handler (const gchar *log_domain,
- GLogLevelFlags log_level,
- const gchar *message,
- gpointer user_data)
-{
- if (stamp_logs)
- {
- GTimeVal now;
- gchar now_str[32];
- gchar *tmp;
- struct tm tm;
-
- g_get_current_time (&now);
- localtime_r (&(now.tv_sec), &tm);
- strftime (now_str, 32, "%Y-%m-%d %H:%M:%S", &tm);
- tmp = g_strdup_printf ("%s.%06ld: %s",
- now_str, now.tv_usec, message);
-
- g_log_default_handler (log_domain, log_level, tmp, NULL);
-
- g_free (tmp);
- }
- else
- {
- g_log_default_handler (log_domain, log_level, message, NULL);
- }
-
- log_to_debug_sender (log_domain, log_level, message);
-}
-
-
static void
teardown_service (TestCaseFixture* fixture,
gconstpointer user_data)
@@ -259,16 +205,6 @@ setup_for_writing (TestCaseFixture *fixture,
}
static void
-setup_debug (void)
-{
- stamp_logs = (g_getenv ("TPL_TIMING") != NULL);
- debug_sender = tp_debug_sender_dup ();
-
- g_log_set_default_handler (log_handler, NULL);
-}
-
-
-static void
test_exists (TestCaseFixture *fixture,
gconstpointer user_data)
{
@@ -743,19 +679,10 @@ main (int argc, char **argv)
GHashTable *params = NULL;
GList *l = NULL;
int retval;
- GTestDBus *test_dbus;
tpl_debug_set_flags ("all");
tp_debug_set_flags ("all");
- /* FIXME: this stuff should be part of the fixture, but setup_debug()
- * uses tp_dbus_daemon_dup() */
- g_test_dbus_unset ();
- test_dbus = g_test_dbus_new (G_TEST_DBUS_NONE);
- g_test_dbus_up (test_dbus);
-
- setup_debug ();
-
/* no account tests */
tp_tests_init (&argc, &argv);
g_test_bug_base ("http://bugs.freedesktop.org/show_bug.cgi?id=");
@@ -804,12 +731,9 @@ main (int argc, char **argv)
TestCaseFixture, params,
setup_for_writing, test_ignorelist, teardown);
- retval = g_test_run ();
+ retval = tp_tests_run_with_bus ();
g_list_free_full (l, (GDestroyNotify) g_hash_table_unref);
- g_test_dbus_down (test_dbus);
- g_clear_object (&test_dbus);
-
return retval;
}
diff --git a/tests/logger/dbus/test-tpl-log-store-pidgin.c b/tests/logger/dbus/test-tpl-log-store-pidgin.c
index be7a523..37fb3cf 100644
--- a/tests/logger/dbus/test-tpl-log-store-pidgin.c
+++ b/tests/logger/dbus/test-tpl-log-store-pidgin.c
@@ -45,58 +45,6 @@ typedef struct
TplEntity *contact;
} PidginTestCaseFixture;
-static TpDebugSender *debug_sender = NULL;
-static gboolean stamp_logs = FALSE;
-
-
-static void
-log_to_debug_sender (const gchar *log_domain,
- GLogLevelFlags log_level,
- const gchar *string)
-{
- GTimeVal now;
-
- g_return_if_fail (TP_IS_DEBUG_SENDER (debug_sender));
-
- g_get_current_time (&now);
-
- tp_debug_sender_add_message (debug_sender, &now, log_domain, log_level,
- string);
-}
-
-
-static void
-log_handler (const gchar *log_domain,
- GLogLevelFlags log_level,
- const gchar *message,
- gpointer user_data)
-{
- if (stamp_logs)
- {
- GTimeVal now;
- gchar now_str[32];
- gchar *tmp;
- struct tm tm;
-
- g_get_current_time (&now);
- localtime_r (&(now.tv_sec), &tm);
- strftime (now_str, 32, "%Y-%m-%d %H:%M:%S", &tm);
- tmp = g_strdup_printf ("%s.%06ld: %s",
- now_str, now.tv_usec, message);
-
- g_log_default_handler (log_domain, log_level, tmp, NULL);
-
- g_free (tmp);
- }
- else
- {
- g_log_default_handler (log_domain, log_level, message, NULL);
- }
-
- log_to_debug_sender (log_domain, log_level, message);
-}
-
-
static void
account_prepare_cb (GObject *source,
GAsyncResult *result,
@@ -522,31 +470,12 @@ test_get_events_for_empty_file (PidginTestCaseFixture *fixture,
g_object_unref (entity);
}
-static void
-setup_debug (void)
-{
- stamp_logs = (g_getenv ("TPL_TIMING") != NULL);
- debug_sender = tp_debug_sender_dup ();
-
- g_log_set_default_handler (log_handler, NULL);
-}
-
-
int
main (int argc, char **argv)
{
GHashTable *params = NULL;
GList *l = NULL;
int retval;
- GTestDBus *test_dbus;
-
- /* FIXME: this stuff should be part of the fixture, but setup_debug()
- * uses tp_dbus_daemon_dup() */
- g_test_dbus_unset ();
- test_dbus = g_test_dbus_new (G_TEST_DBUS_NONE);
- g_test_dbus_up (test_dbus);
-
- setup_debug ();
/* no account tests */
tp_tests_init (&argc, &argv);
@@ -627,12 +556,9 @@ main (int argc, char **argv)
PidginTestCaseFixture, params,
setup, test_get_events_for_empty_file, teardown);
- retval = g_test_run ();
+ retval = tp_tests_run_with_bus ();
g_list_free_full (l, (GDestroyNotify) g_hash_table_unref);
- g_test_dbus_down (test_dbus);
- g_clear_object (&test_dbus);
-
return retval;
}
More information about the telepathy-commits
mailing list