From cdb14a194e08eac5e34ac22f0183a478cfc413d7 Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@redhat.com>
Date: Wed, 25 Dec 2013 23:51:26 -0500
Subject: [PATCH] Improve testing test coverage

In particular, test the just-fixed g_test_trap_reached_timeout.
---
 glib/tests/testing.c | 41 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 41 insertions(+)

diff --git a/glib/tests/testing.c b/glib/tests/testing.c
index 1025f12..c616f9a 100644
--- a/glib/tests/testing.c
+++ b/glib/tests/testing.c
@@ -586,6 +586,44 @@ test_pass (void)
 {
 }
 
+static void
+test_fail (void)
+{
+  if (g_test_subprocess ())
+    {
+      g_test_fail ();
+      g_assert (g_test_failed ());
+      return;
+    }
+  g_test_trap_subprocess (NULL, 0, 0);
+  g_test_trap_assert_failed ();
+}
+
+static void
+test_incomplete (void)
+{
+  if (g_test_subprocess ())
+    {
+      g_test_incomplete ("not done");
+      g_assert (g_test_failed ());
+      return;
+    }
+  g_test_trap_subprocess (NULL, 0, 0);
+  g_test_trap_assert_failed ();
+}
+
+static void
+test_subprocess_timed_out (void)
+{
+  if (g_test_subprocess ())
+    {
+      g_usleep (1000000);
+      return;
+    }
+  g_test_trap_subprocess (NULL, 50000, 0);
+  g_assert (g_test_trap_reached_timeout ());
+}
+
 static const char *argv0;
 
 static void
@@ -721,6 +759,9 @@ main (int   argc,
   g_test_add_func ("/misc/skip-all/subprocess/skip1", test_skip);
   g_test_add_func ("/misc/skip-all/subprocess/skip2", test_skip);
   g_test_add_func ("/misc/skip-all/subprocess/pass", test_pass);
+  g_test_add_func ("/misc/fail", test_fail);
+  g_test_add_func ("/misc/incomplete", test_incomplete);
+  g_test_add_func ("/misc/timeout", test_subprocess_timed_out);
 
   return g_test_run();
 }
-- 
2.7.4