[glib] Revert "Add a test for expected messages with structured logging"

[Philip Withnall <pwithnall src gnome org>]

commit 2a5d9f88984a4c708665b3b5e37151ad8d2bfda2
Author: Philip Withnall <philip withnall collabora co uk>
Date:   Wed Aug 3 21:28:06 2016 +0100

    Revert "Add a test for expected messages with structured logging"
    
    This reverts commit bc40c7a05cbd0e7c9b97ce86cccb6a4b78c2e56a.
    
    We are going to make g_test_expect_message() only work for the old
    logging API.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=769486

 glib/tests/testing.c |   27 ---------------------------
 1 files changed, 0 insertions(+), 27 deletions(-)
---
diff --git a/glib/tests/testing.c b/glib/tests/testing.c
index e330d3e..3913506 100644
--- a/glib/tests/testing.c
+++ b/glib/tests/testing.c
@@ -369,14 +369,6 @@ test_expected_messages_warning (void)
 }
 
 static void
-test_expected_messages_warning_structured (void)
-{
-  g_log_structured (G_LOG_DOMAIN, G_LOG_LEVEL_WARNING,
-                    "MESSAGE", "This is a %d warning", g_random_int ());
-  g_return_if_reached ();
-}
-
-static void
 test_expected_messages_expect_warning (void)
 {
   g_test_expect_message (G_LOG_DOMAIN, G_LOG_LEVEL_WARNING,
@@ -407,20 +399,6 @@ test_expected_messages_expected (void)
 }
 
 static void
-test_expected_messages_structured (void)
-{
-  g_test_expect_message (G_LOG_DOMAIN, G_LOG_LEVEL_WARNING,
-                         "This is a * warning");
-  g_test_expect_message (G_LOG_DOMAIN, G_LOG_LEVEL_CRITICAL,
-                         "*should not be reached");
-
-  test_expected_messages_warning_structured ();
-
-  g_test_assert_expected_messages ();
-  exit (0);
-}
-
-static void
 test_expected_messages_null_domain (void)
 {
   g_test_expect_message (NULL, G_LOG_LEVEL_WARNING, "no domain");
@@ -491,10 +469,6 @@ test_expected_messages (void)
   g_test_trap_assert_passed ();
   g_test_trap_assert_stderr ("");
 
-  g_test_trap_subprocess ("/misc/expected-messages/subprocess/structured", 0, 7);
-  g_test_trap_assert_passed ();
-  g_test_trap_assert_stderr ("");
-
   g_test_trap_subprocess ("/misc/expected-messages/subprocess/null-domain", 0, 0);
   g_test_trap_assert_passed ();
   g_test_trap_assert_stderr ("");
@@ -795,7 +769,6 @@ main (int   argc,
   g_test_add_func ("/misc/expected-messages/subprocess/expect-warning", 
test_expected_messages_expect_warning);
   g_test_add_func ("/misc/expected-messages/subprocess/wrong-warning", test_expected_messages_wrong_warning);
   g_test_add_func ("/misc/expected-messages/subprocess/expected", test_expected_messages_expected);
-  g_test_add_func ("/misc/expected-messages/subprocess/structured", test_expected_messages_structured);
   g_test_add_func ("/misc/expected-messages/subprocess/null-domain", test_expected_messages_null_domain);
   g_test_add_func ("/misc/expected-messages/subprocess/extra-warning", test_expected_messages_extra_warning);
   g_test_add_func ("/misc/expected-messages/subprocess/unexpected-extra-warning", 
test_expected_messages_unexpected_extra_warning);