Attachment 58024 Details for Bug 45842 – tests/dbus/cm: use g_assert_no_error for better diagnostics

[patch] tests/dbus/cm: use g_assert_no_error for better diagnostics

0001-tests-dbus-cm-use-g_assert_no_error-for-better-diagn.patch (text/plain), 4.75 KB, created by Simon McVittie on 2012-03-05 07:59:09 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Simon McVittie

Created: 2012-03-05 07:59:09 UTC

Size: 4.75 KB

patch

obsolete

>From 3295e8723734353640a4d3ffc8518184628c8470 Mon Sep 17 00:00:00 2001
>From: Simon McVittie <simon.mcvittie@collabora.co.uk>
>Date: Mon, 5 Mar 2012 13:36:51 +0000
>Subject: [PATCH 1/4] tests/dbus/cm: use g_assert_no_error for better
> diagnostics
>
>---
> tests/dbus/cm.c |   26 +++++++++++++-------------
> 1 files changed, 13 insertions(+), 13 deletions(-)
>
>diff --git a/tests/dbus/cm.c b/tests/dbus/cm.c
>index 0200793..c31f682 100644
>--- a/tests/dbus/cm.c
>+++ b/tests/dbus/cm.c
>@@ -168,7 +168,7 @@ test_nothing_got_info (Test *test,
>   test->cm = tp_connection_manager_new (test->dbus, "not_actually_there",
>       NULL, &error);
>   g_assert (TP_IS_CONNECTION_MANAGER (test->cm));
>-  g_assert (error == NULL);
>+  g_assert_no_error (error);
>   g_test_queue_unref (test->cm);
> 
>   /* Spin the mainloop until we get the got-info signal. This API is rubbish,
>@@ -214,7 +214,7 @@ test_file_got_info (Test *test,
>   test->cm = tp_connection_manager_new (test->dbus, "spurious",
>       NULL, &error);
>   g_assert (TP_IS_CONNECTION_MANAGER (test->cm));
>-  g_assert (error == NULL);
>+  g_assert_no_error (error);
>   g_test_queue_unref (test->cm);
> 
>   g_test_bug ("18207");
>@@ -355,7 +355,7 @@ test_complex_file_got_info (Test *test,
>   test->cm = tp_connection_manager_new (test->dbus, "test_manager_file",
>       NULL, &error);
>   g_assert (TP_IS_CONNECTION_MANAGER (test->cm));
>-  g_assert (error == NULL);
>+  g_assert_no_error (error);
>   g_test_queue_unref (test->cm);
> 
>   g_test_bug ("18207");
>@@ -710,7 +710,7 @@ test_dbus_got_info (Test *test,
>       TP_BASE_CONNECTION_MANAGER_GET_CLASS (test->service_cm)->cm_dbus_name,
>       NULL, &error);
>   g_assert (TP_IS_CONNECTION_MANAGER (test->cm));
>-  g_assert (error == NULL);
>+  g_assert_no_error (error);
>   g_test_queue_unref (test->cm);
> 
>   g_test_bug ("18207");
>@@ -745,7 +745,7 @@ test_nothing_ready (Test *test,
>   test->cm = tp_connection_manager_new (test->dbus, "nonexistent_cm",
>       NULL, &test->error);
>   g_assert (TP_IS_CONNECTION_MANAGER (test->cm));
>-  g_assert (test->error == NULL);
>+  g_assert_no_error (test->error);
>   g_test_queue_unref (test->cm);
> 
>   g_test_bug ("18291");
>@@ -783,7 +783,7 @@ test_file_ready (Test *test,
>   test->cm = tp_connection_manager_new (test->dbus, "spurious",
>       NULL, &test->error);
>   g_assert (TP_IS_CONNECTION_MANAGER (test->cm));
>-  g_assert (test->error == NULL);
>+  g_assert_no_error (test->error);
>   g_test_queue_unref (test->cm);
> 
>   g_test_bug ("18291");
>@@ -791,7 +791,7 @@ test_file_ready (Test *test,
>   tp_connection_manager_call_when_ready (test->cm, ready_or_not,
>       test, NULL, NULL);
>   g_main_loop_run (test->mainloop);
>-  g_assert (test->error == NULL);
>+  g_assert_no_error (test->error);
> 
>   g_assert_cmpstr (tp_connection_manager_get_name (test->cm), ==,
>       "spurious");
>@@ -821,7 +821,7 @@ test_complex_file_ready (Test *test,
>   test->cm = tp_connection_manager_new (test->dbus, "test_manager_file",
>       NULL, &test->error);
>   g_assert (TP_IS_CONNECTION_MANAGER (test->cm));
>-  g_assert (test->error == NULL);
>+  g_assert_no_error (test->error);
>   g_test_queue_unref (test->cm);
> 
>   g_test_bug ("18291");
>@@ -829,7 +829,7 @@ test_complex_file_ready (Test *test,
>   tp_connection_manager_call_when_ready (test->cm, ready_or_not,
>       test, NULL, NULL);
>   g_main_loop_run (test->mainloop);
>-  g_assert (test->error == NULL);
>+  g_assert_no_error (test->error);
> 
>   g_assert_cmpstr (tp_connection_manager_get_name (test->cm), ==,
>       "test_manager_file");
>@@ -867,7 +867,7 @@ test_dbus_ready (Test *test,
>       TP_BASE_CONNECTION_MANAGER_GET_CLASS (test->service_cm)->cm_dbus_name,
>       NULL, &test->error);
>   g_assert (TP_IS_CONNECTION_MANAGER (test->cm));
>-  g_assert (test->error == NULL);
>+  g_assert_no_error (test->error);
>   g_test_queue_unref (test->cm);
> 
>   if (activate)
>@@ -890,7 +890,7 @@ test_dbus_ready (Test *test,
>   tp_connection_manager_call_when_ready (test->cm, ready_or_not,
>       test, NULL, NULL);
>   g_main_loop_run (test->mainloop);
>-  g_assert (test->error == NULL);
>+  g_assert_no_error (test->error);
> 
>   g_assert_cmpstr (tp_connection_manager_get_name (test->cm), ==,
>       "example_echo");
>@@ -936,7 +936,7 @@ test_dbus_fallback (Test *test,
>       TP_BASE_CONNECTION_MANAGER_GET_CLASS (test->service_cm)->cm_dbus_name,
>       NULL, &test->error);
>   g_assert (TP_IS_CONNECTION_MANAGER (test->cm));
>-  g_assert (test->error == NULL);
>+  g_assert_no_error (test->error);
>   g_test_queue_unref (test->cm);
> 
>   if (activate)
>@@ -959,7 +959,7 @@ test_dbus_fallback (Test *test,
>   tp_connection_manager_call_when_ready (test->cm, ready_or_not,
>       test, NULL, NULL);
>   g_main_loop_run (test->mainloop);
>-  g_assert (test->error == NULL);
>+  g_assert_no_error (test->error);
> 
>   g_assert_cmpstr (tp_connection_manager_get_name (test->cm), ==,
>       "example_echo");
>-- 
>1.7.9.1
>

Actions: View | Splinter Review

Attachments on bug 45842: 57940 | 57941 | 57942 | 57943 | 57944 | 57945 | 57946 | 58024 | 58025 | 58026 | 58027 | 58031 | 58032 | 58053

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.