Attachment 48281 Details for Bug 34393 – Add a regression test that can reproduce fd.o #34393 (v2)

[patch] Add a regression test that can reproduce fd.o #34393 (v2)

0001-Add-a-regression-test-that-can-reproduce-fd.o-34393.patch (text/plain), 5.29 KB, created by Simon McVittie on 2011-06-22 05:55:22 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Simon McVittie

Created: 2011-06-22 05:55:22 UTC

Size: 5.29 KB

patch

obsolete

>From e7df242d998869fa81c84e85b0372a021ee07385 Mon Sep 17 00:00:00 2001
>From: Simon McVittie <simon.mcvittie@collabora.co.uk>
>Date: Fri, 11 Mar 2011 13:24:08 +0000
>Subject: [PATCH] Add a regression test that can reproduce fd.o #34393
>
>The number of messages is arbitrary; the more messages, the more likely
>the crash is. 2000 messages seem to cause it reliably on this laptop,
>but I've set it to 10000 to be safe.
>
>Bug: https://bugs.freedesktop.org/show_bug.cgi?id=34393
>---
> test/data/valid-config-files/incoming-limit.conf |   18 +++++
> test/dbus-daemon.c                               |   75 +++++++++++++++++-----
> 2 files changed, 77 insertions(+), 16 deletions(-)
> create mode 100644 test/data/valid-config-files/incoming-limit.conf
>
>diff --git a/test/data/valid-config-files/incoming-limit.conf b/test/data/valid-config-files/incoming-limit.conf
>new file mode 100644
>index 0000000..abfab3f
>--- /dev/null
>+++ b/test/data/valid-config-files/incoming-limit.conf
>@@ -0,0 +1,18 @@
>+<!DOCTYPE busconfig PUBLIC "-//freedesktop//DTD D-Bus Bus Configuration 1.0//EN"
>+ "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
>+<busconfig>
>+  
>+  <type>session</type>
>+  <listen>unix:tmpdir=/tmp</listen>
>+
>+  <policy context="default">
>+    
>+    <allow send_destination="*" eavesdrop="true"/>
>+    
>+    <allow eavesdrop="true"/>
>+    
>+    <allow own="*"/>
>+  </policy>
>+
>+  <limit name="max_incoming_bytes">1</limit>
>+</busconfig>
>diff --git a/test/dbus-daemon.c b/test/dbus-daemon.c
>index ed10d09..c190cb4 100644
>--- a/test/dbus-daemon.c
>+++ b/test/dbus-daemon.c
>@@ -41,6 +41,8 @@
> #endif
> 
> typedef struct {
>+    gboolean skip;
>+
>     DBusError e;
>     GError *ge;
> 
>@@ -167,42 +169,63 @@ echo_filter (DBusConnection *connection,
>   return DBUS_HANDLER_RESULT_HANDLED;
> }
> 
>+typedef struct {
>+    const char *bug_ref;
>+    guint min_messages;
>+    const char *config_file;
>+} Config;
>+
> static void
> setup (Fixture *f,
>-    gconstpointer context G_GNUC_UNUSED)
>+    gconstpointer context)
> {
>+  const Config *config = context;
>   gchar *dbus_daemon;
>-  gchar *config;
>+  gchar *arg;
>   gchar *address;
> 
>   f->ge = NULL;
>   dbus_error_init (&f->e);
> 
>-  dbus_daemon = g_strdup (g_getenv ("DBUS_TEST_DAEMON"));
>-
>-  if (dbus_daemon == NULL)
>-    dbus_daemon = g_strdup ("dbus-daemon");
>+  if (config != NULL && config->config_file != NULL)
>+    {
>+      if (g_getenv ("DBUS_TEST_DATA") == NULL)
>+        {
>+          g_message ("SKIP: set DBUS_TEST_DATA to a directory containing %s",
>+              config->config_file);
>+          f->skip = TRUE;
>+          return;
>+        }
> 
>-  if (g_getenv ("DBUS_TEST_SYSCONFDIR") != NULL)
>+      arg = g_strdup_printf (
>+          "--config-file=%s/%s",
>+          g_getenv ("DBUS_TEST_DATA"), config->config_file);
>+    }
>+  else if (g_getenv ("DBUS_TEST_SYSCONFDIR") != NULL)
>     {
>-      config = g_strdup_printf ("--config-file=%s/dbus-1/session.conf",
>+      arg = g_strdup_printf ("--config-file=%s/dbus-1/session.conf",
>           g_getenv ("DBUS_TEST_SYSCONFDIR"));
>     }
>   else if (g_getenv ("DBUS_TEST_DATA") != NULL)
>     {
>-      config = g_strdup_printf (
>+      arg = g_strdup_printf (
>           "--config-file=%s/valid-config-files/session.conf",
>           g_getenv ("DBUS_TEST_DATA"));
>     }
>   else
>     {
>-      config = g_strdup ("--session");
>+      arg = g_strdup ("--session");
>     }
> 
>-  address = spawn_dbus_daemon (dbus_daemon, config, &f->daemon_pid);
>+  dbus_daemon = g_strdup (g_getenv ("DBUS_TEST_DAEMON"));
>+
>+  if (dbus_daemon == NULL)
>+    dbus_daemon = g_strdup ("dbus-daemon");
>+
>+  address = spawn_dbus_daemon (dbus_daemon, arg, &f->daemon_pid);
> 
>   g_free (dbus_daemon);
>-  g_free (config);
>+  g_free (arg);
> 
>   f->left_conn = connect_to_bus (address);
>   f->right_conn = connect_to_bus (address);
>@@ -229,16 +252,26 @@ pc_count (DBusPendingCall *pc,
> 
> static void
> test_echo (Fixture *f,
>-    gconstpointer context G_GNUC_UNUSED)
>+    gconstpointer context)
> {
>+  const Config *config = context;
>   guint count = 2000;
>   guint sent;
>   guint received = 0;
>   double elapsed;
> 
>+  if (f->skip)
>+    return;
>+
>+  if (config != NULL && config->bug_ref != NULL)
>+    g_test_bug (config->bug_ref);
>+
>   if (g_test_perf ())
>     count = 100000;
> 
>+  if (config != NULL)
>+    count = MAX (config->min_messages, count);
>+
>   add_echo_filter (f);
> 
>   g_test_timer_start ();
>@@ -304,15 +337,23 @@ teardown (Fixture *f,
>       f->right_conn = NULL;
>     }
> 
>+  if (f->daemon_pid != 0)
>+    {
> #ifdef DBUS_WIN
>-  TerminateProcess (f->daemon_pid, 1);
>+      TerminateProcess (f->daemon_pid, 1);
> #else
>-  kill (f->daemon_pid, SIGTERM);
>+      kill (f->daemon_pid, SIGTERM);
> #endif
> 
>-  g_spawn_close_pid (f->daemon_pid);
>+      g_spawn_close_pid (f->daemon_pid);
>+      f->daemon_pid = 0;
>+    }
> }
> 
>+static Config limited_config = {
>+    "34393", 10000, "valid-config-files/incoming-limit.conf"
>+};
>+
> int
> main (int argc,
>     char **argv)
>@@ -321,6 +362,8 @@ main (int argc,
>   g_test_bug_base ("https://bugs.freedesktop.org/show_bug.cgi?id=");
> 
>   g_test_add ("/echo/session", Fixture, NULL, setup, test_echo, teardown);
>+  g_test_add ("/echo/limited", Fixture, &limited_config,
>+      setup, test_echo, teardown);
> 
>   return g_test_run ();
> }
>-- 
>1.7.5.4
>

Actions: View | Splinter Review

Attachments on bug 34393: 43814 | 43815 | 43816 | 43817 | 43818 | 43819 | 43820 | 43821 | 43822 | 43823 | 44207 | 44314 | 44317 | 44353 | 46155 | 46157 | 48281

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.