[gjs: 18/26] tests: Don't remove log handler during test
- From: Cosimo Cecchi <cosimoc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gjs: 18/26] tests: Don't remove log handler during test
- Date: Sun, 14 Apr 2019 14:04:53 +0000 (UTC)
commit 40a5a964dacea210c5950400a94db0d14db5b0bd
Author: Philip Chimento <philip chimento gmail com>
Date: Sun Mar 24 19:58:05 2019 -0700
tests: Don't remove log handler during test
I'm not sure why this was here, but it seems to be no longer necessary.
If it becomes necessary in the future, then we should use
g_test_expect_message() instead.
test/gjs-test-coverage.cpp | 15 ---------------
1 file changed, 15 deletions(-)
---
diff --git a/test/gjs-test-coverage.cpp b/test/gjs-test-coverage.cpp
index 2f26c0a0..2d45b489 100644
--- a/test/gjs-test-coverage.cpp
+++ b/test/gjs-test-coverage.cpp
@@ -428,14 +428,6 @@ test_expected_source_file_name_written_to_coverage_data(gpointer fixture_da
g_free(coverage_data_contents);
}
-static void
-silence_log_func(const gchar *domain,
- GLogLevelFlags log_level,
- const gchar *message,
- gpointer user_data)
-{
-}
-
static void
test_expected_entry_not_written_for_nonexistent_file(gpointer fixture_data,
gconstpointer user_data)
@@ -451,18 +443,11 @@ test_expected_entry_not_written_for_nonexistent_file(gpointer fixture_data,
fixture->coverage = gjs_coverage_new(coverage_paths, fixture->context,
fixture->lcov_output_dir);
- /* Temporarily disable fatal mask and silence warnings */
- GLogLevelFlags old_flags = g_log_set_always_fatal((GLogLevelFlags) G_LOG_LEVEL_ERROR);
- GLogFunc old_log_func = g_log_set_default_handler(silence_log_func, NULL);
-
GFile *doesnotexist = g_file_new_for_path("doesnotexist");
char *coverage_data_contents =
eval_script_and_get_coverage_data(fixture->context, fixture->coverage,
doesnotexist, fixture->lcov_output);
- g_log_set_always_fatal(old_flags);
- g_log_set_default_handler(old_log_func, NULL);
-
const char *sf_line = line_starting_with(coverage_data_contents, "SF:");
g_assert_null(sf_line);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]