[evolution-data-server/gnome-3-8] Test suite cleanups.



commit 288fcc8f89c03947d978107edd4380b6712ea5ff
Author: Matthew Barnes <mbarnes redhat com>
Date:   Sun Apr 14 09:24:04 2013 -0400

    Test suite cleanups.
    
    (cherry picked from commit 4fb88510a2277e1cbeac9c97de21ec94b147fa8b)

 addressbook/backends/google/tests/phone-numbers.c  |   2 +-
 tests/libebook-contacts/test-contact-types.c       |  78 +++--
 tests/libebook-contacts/test-phone-number.c        |  90 ++++--
 tests/libebook-contacts/test-query.c               |   1 +
 tests/libebook-contacts/test-untyped-phones.c      |   1 +
 tests/libebook-contacts/test-vcard-parsing.c       |   6 +-
 .../client/test-client-add-and-get-async.c         |  24 +-
 .../libebook/client/test-client-add-and-get-sync.c |   9 +-
 tests/libebook/client/test-client-add-contact.c    |  17 +-
 tests/libebook/client/test-client-custom-summary.c | 337 +++++++++++++++------
 tests/libebook/client/test-client-e164-param.c     |  49 ++-
 .../libebook/client/test-client-get-contact-uids.c |  33 +-
 tests/libebook/client/test-client-get-contact.c    |  33 +-
 tests/libebook/client/test-client-get-revision.c   |  38 ++-
 tests/libebook/client/test-client-get-view.c       |  33 +-
 tests/libebook/client/test-client-modify-contact.c |  17 +-
 tests/libebook/client/test-client-photo-is-uri.c   |   9 +-
 tests/libebook/client/test-client-preserve-uid.c   |  17 +-
 tests/libebook/client/test-client-refresh.c        |  17 +-
 .../client/test-client-remove-contact-by-uid.c     |  17 +-
 tests/libebook/client/test-client-remove-contact.c |  40 ++-
 .../libebook/client/test-client-remove-contacts.c  |  17 +-
 tests/libebook/client/test-client-revision-view.c  |  17 +-
 tests/libebook/client/test-client-self.c           |  23 +-
 .../client/test-client-suppress-notifications.c    |  33 +-
 tests/libebook/client/test-client-uid-only-view.c  |  33 +-
 .../libebook/client/test-client-view-operations.c  |  57 ++--
 tests/libebook/client/test-client-write-write.c    |  10 +-
 tests/libebook/test-ebook-add-contact.c            |  17 +-
 tests/libebook/test-ebook-commit-contact.c         |  17 +-
 tests/libebook/test-ebook-get-book-view.c          |  17 +-
 tests/libebook/test-ebook-get-contact.c            |  17 +-
 tests/libebook/test-ebook-get-required-fields.c    |  17 +-
 .../libebook/test-ebook-get-static-capabilities.c  |   9 +-
 .../test-ebook-get-supported-auth-methods.c        |  17 +-
 tests/libebook/test-ebook-get-supported-fields.c   |  17 +-
 tests/libebook/test-ebook-remove-contact-by-id.c   |   9 +-
 tests/libebook/test-ebook-remove-contact.c         |  17 +-
 tests/libebook/test-ebook-remove-contacts.c        |  17 +-
 tests/libecal/client/test-client-add-timezone.c    |  17 +-
 tests/libecal/client/test-client-bulk-methods.c    |   9 +-
 tests/libecal/client/test-client-create-object.c   |  17 +-
 .../client/test-client-get-attachment-uris.c       |  17 +-
 tests/libecal/client/test-client-get-free-busy.c   |  17 +-
 tests/libecal/client/test-client-get-object-list.c |  17 +-
 tests/libecal/client/test-client-get-revision.c    |  64 ++--
 tests/libecal/client/test-client-get-view.c        |  17 +-
 tests/libecal/client/test-client-modify-object.c   |  17 +-
 tests/libecal/client/test-client-receive-objects.c |  17 +-
 tests/libecal/client/test-client-refresh.c         |  17 +-
 tests/libecal/client/test-client-remove-object.c   |  17 +-
 tests/libecal/client/test-client-revision-view.c   |  17 +-
 tests/libecal/client/test-client-send-objects.c    |  17 +-
 tests/libecal/test-ecal-add-timezone.c             |   9 +-
 tests/libecal/test-ecal-create-object--2.c         |   9 +-
 tests/libecal/test-ecal-create-object.c            |   9 +-
 tests/libecal/test-ecal-get-alarm-email-address.c  |   9 +-
 tests/libecal/test-ecal-get-cal-address.c          |   9 +-
 tests/libecal/test-ecal-get-capabilities.c         |   9 +-
 tests/libecal/test-ecal-get-default-object.c       |   9 +-
 tests/libecal/test-ecal-get-free-busy.c            |   9 +-
 tests/libecal/test-ecal-get-ldap-attribute.c       |   9 +-
 tests/libecal/test-ecal-get-object-list.c          |   9 +-
 tests/libecal/test-ecal-get-objects-for-uid.c      |   9 +-
 tests/libecal/test-ecal-get-query.c                |   9 +-
 tests/libecal/test-ecal-get-timezone.c             |   9 +-
 tests/libecal/test-ecal-modify-object.c            |   9 +-
 tests/libecal/test-ecal-receive-objects.c          |   9 +-
 tests/libecal/test-ecal-remove-object.c            |   9 +-
 tests/libecal/test-ecal-send-objects.c             |   9 +-
 tests/libecal/test-ecal-set-default-timezone.c     |   9 +-
 tests/libedataserver/e-source-test.c               |   1 +
 tests/test-server-utils/e-test-server-utils.c      |  33 +-
 tests/test-server-utils/test-fixture.c             |  41 ++-
 74 files changed, 1260 insertions(+), 483 deletions(-)
---
diff --git a/addressbook/backends/google/tests/phone-numbers.c 
b/addressbook/backends/google/tests/phone-numbers.c
index b67fb66..de8c3ec 100644
--- a/addressbook/backends/google/tests/phone-numbers.c
+++ b/addressbook/backends/google/tests/phone-numbers.c
@@ -118,7 +118,7 @@ main (gint argc,
 {
        g_type_init ();
        g_test_init (&argc, &argv, NULL);
-       g_test_bug_base ("https://bugzilla.gnome.org/show_bug.cgi?id=";);
+       g_test_bug_base ("https://bugzilla.gnome.org/";);
 
        g_test_add_func ("/phone-numbers/label-and-type", test_label_and_type);
        g_test_add_func ("/phone-numbers/label-nor-type", test_label_nor_type);
diff --git a/tests/libebook-contacts/test-contact-types.c b/tests/libebook-contacts/test-contact-types.c
index 01f0717..b590457 100644
--- a/tests/libebook-contacts/test-contact-types.c
+++ b/tests/libebook-contacts/test-contact-types.c
@@ -1,21 +1,20 @@
 #include <string.h>
 #include <libebook-contacts/libebook-contacts.h>
 
-
 typedef struct {
        EContact *contact;
 } TypesFixture;
 
 static void
 types_setup (TypesFixture *fixture,
-            gconstpointer user_data)
+             gconstpointer user_data)
 {
        fixture->contact = e_contact_new ();
 }
 
 static void
 types_teardown (TypesFixture *fixture,
-               gconstpointer user_data)
+                gconstpointer user_data)
 {
        g_object_unref (fixture->contact);
 }
@@ -27,10 +26,10 @@ types_teardown (TypesFixture *fixture,
        */
 static void
 test_undefined_field (TypesFixture *fixture,
-                     gconstpointer user_data)
+                      gconstpointer user_data)
 {
        gpointer test;
-       
+
        test = e_contact_get (fixture->contact, 6000 /* something suitably high. */);
        g_assert (test == NULL);
 }
@@ -41,7 +40,7 @@ test_undefined_field (TypesFixture *fixture,
 
 static void
 test_string (TypesFixture *fixture,
-            gconstpointer user_data)
+             gconstpointer user_data)
 {
        e_contact_set (fixture->contact, E_CONTACT_UID, TEST_ID);
        g_assert_cmpstr (e_contact_get_const (fixture->contact, E_CONTACT_UID), ==, TEST_ID);
@@ -50,7 +49,7 @@ test_string (TypesFixture *fixture,
 /************* DATE *****************/
 static void
 test_date (TypesFixture *fixture,
-          gconstpointer user_data)
+           gconstpointer user_data)
 {
        EContactDate date, *dp;
 
@@ -93,7 +92,7 @@ static const gchar *photo_data =
 
 static void
 test_photo (TypesFixture *fixture,
-           gconstpointer user_data)
+            gconstpointer user_data)
 {
        EContactPhoto *photo, *new_photo;
        guchar *data;
@@ -123,7 +122,7 @@ test_photo (TypesFixture *fixture,
 /************* CATEGORIES *****************/
 static void
 test_categories_initially_null_list (TypesFixture *fixture,
-                                    gconstpointer user_data)
+                                     gconstpointer user_data)
 {
        gpointer test;
 
@@ -133,7 +132,7 @@ test_categories_initially_null_list (TypesFixture *fixture,
 
 static void
 test_categories_convert_to_string (TypesFixture *fixture,
-                                  gconstpointer user_data)
+                                   gconstpointer user_data)
 {
        GList *category_list;
        gchar *categories;
@@ -153,7 +152,7 @@ test_categories_convert_to_string (TypesFixture *fixture,
 
 static void
 test_categories_convert_to_list (TypesFixture *fixture,
-                                gconstpointer user_data)
+                                 gconstpointer user_data)
 {
        GList *category_list;
 
@@ -175,23 +174,52 @@ main (gint argc,
        g_type_init ();
 
        g_test_init (&argc, &argv, NULL);
+       g_test_bug_base ("http://bugzilla.gnome.org/";);
 
 #if 0   /* This can't properly be tested, the assertion causes the test to break */
-       g_test_add ("/Contact/Types/UndefinedField", TypesFixture, NULL,
-                   types_setup, test_undefined_field, types_teardown);
+       g_test_add (
+               "/Contact/Types/UndefinedField",
+               TypesFixture, NULL,
+               types_setup,
+               test_undefined_field,
+               types_teardown);
 #endif
-       g_test_add ("/Contact/Types/String", TypesFixture, NULL,
-                   types_setup, test_string, types_teardown);
-       g_test_add ("/Contact/Types/Date", TypesFixture, NULL,
-                   types_setup, test_date, types_teardown);
-       g_test_add ("/Contact/Types/Photo", TypesFixture, NULL,
-                   types_setup, test_photo, types_teardown);
-       g_test_add ("/Contact/Types/Categories/InitiallyNullList", TypesFixture, NULL,
-                   types_setup, test_categories_initially_null_list, types_teardown);
-       g_test_add ("/Contact/Types/Categories/ConvertToString", TypesFixture, NULL,
-                   types_setup, test_categories_convert_to_string, types_teardown);
-       g_test_add ("/Contact/Types/Categories/ConvertToList", TypesFixture, NULL,
-                   types_setup, test_categories_convert_to_list, types_teardown);
+       g_test_add (
+               "/Contact/Types/String",
+               TypesFixture, NULL,
+               types_setup,
+               test_string,
+               types_teardown);
+       g_test_add (
+               "/Contact/Types/Date",
+               TypesFixture, NULL,
+               types_setup,
+               test_date,
+               types_teardown);
+       g_test_add (
+               "/Contact/Types/Photo",
+               TypesFixture, NULL,
+               types_setup,
+               test_photo,
+               types_teardown);
+       g_test_add (
+               "/Contact/Types/Categories/InitiallyNullList",
+               TypesFixture, NULL,
+               types_setup,
+               test_categories_initially_null_list,
+               types_teardown);
+       g_test_add (
+               "/Contact/Types/Categories/ConvertToString",
+               TypesFixture, NULL,
+               types_setup,
+               test_categories_convert_to_string,
+               types_teardown);
+       g_test_add (
+               "/Contact/Types/Categories/ConvertToList",
+               TypesFixture, NULL,
+               types_setup,
+               test_categories_convert_to_list,
+               types_teardown);
 
        return g_test_run ();
 }
diff --git a/tests/libebook-contacts/test-phone-number.c b/tests/libebook-contacts/test-phone-number.c
index 6dd3e7c..bfa74f1 100644
--- a/tests/libebook-contacts/test-phone-number.c
+++ b/tests/libebook-contacts/test-phone-number.c
@@ -413,41 +413,72 @@ main (gint argc,
        g_type_init ();
 
        g_test_init (&argc, &argv, NULL);
+       g_test_bug_base ("http://bugzilla.gnome.org/";);
 
-       g_test_add_func
-               ("/ebook-phone-number/supported",
-                test_supported);
+       g_test_add_func (
+               "/ebook-phone-number/supported",
+               test_supported);
 
        g_test_add_data_func_full (
-               "/ebook-phone-number/parse-and-format/i164", parse_and_format_data_new (
+               "/ebook-phone-number/parse-and-format/i164",
+               parse_and_format_data_new (
                        "+493011223344", NULL,
-                       E_PHONE_NUMBER_COUNTRY_FROM_FQTN, 49, "3011223344",
-                       "+493011223344", "+49 30 11223344", "030 11223344", "tel:+49-30-11223344"),
-               test_parse_and_format, parse_and_format_data_free);
+                       E_PHONE_NUMBER_COUNTRY_FROM_FQTN,
+                       49, "3011223344",
+                       "+493011223344",
+                       "+49 30 11223344",
+                       "030 11223344",
+                       "tel:+49-30-11223344"),
+               test_parse_and_format,
+               parse_and_format_data_free);
        g_test_add_data_func_full (
-               "/ebook-phone-number/parse-and-format/national", parse_and_format_data_new (
-               "(030) 22334-455", "DE",
-               E_PHONE_NUMBER_COUNTRY_FROM_DEFAULT, 49, "3022334455",
-               "+493022334455", "+49 30 22334455", "030 22334455", "tel:+49-30-22334455"),
-               test_parse_and_format, parse_and_format_data_free);
+               "/ebook-phone-number/parse-and-format/national",
+               parse_and_format_data_new (
+                       "(030) 22334-455", "DE",
+                       E_PHONE_NUMBER_COUNTRY_FROM_DEFAULT,
+                       49, "3022334455",
+                       "+493022334455",
+                       "+49 30 22334455",
+                       "030 22334455",
+                       "tel:+49-30-22334455"),
+               test_parse_and_format,
+               parse_and_format_data_free);
        g_test_add_data_func_full (
-               "/ebook-phone-number/parse-and-format/national2", parse_and_format_data_new (
-               "0049 (30) 22334-455", "DE",
-               E_PHONE_NUMBER_COUNTRY_FROM_IDD, 49, "3022334455",
-               "+493022334455", "+49 30 22334455", "030 22334455", "tel:+49-30-22334455"),
-               test_parse_and_format, parse_and_format_data_free);
+               "/ebook-phone-number/parse-and-format/national2",
+               parse_and_format_data_new (
+                       "0049 (30) 22334-455", "DE",
+                       E_PHONE_NUMBER_COUNTRY_FROM_IDD,
+                       49, "3022334455",
+                       "+493022334455",
+                       "+49 30 22334455",
+                       "030 22334455",
+                       "tel:+49-30-22334455"),
+               test_parse_and_format,
+               parse_and_format_data_free);
        g_test_add_data_func_full (
-               "/ebook-phone-number/parse-and-format/international", parse_and_format_data_new (
-               "+1 212 33445566", NULL,
-               E_PHONE_NUMBER_COUNTRY_FROM_FQTN, 1, "21233445566",
-               "+121233445566", "+1 21233445566", "21233445566", "tel:+1-21233445566"),
-               test_parse_and_format, parse_and_format_data_free);
+               "/ebook-phone-number/parse-and-format/international",
+               parse_and_format_data_new (
+                       "+1 212 33445566", NULL,
+                       E_PHONE_NUMBER_COUNTRY_FROM_FQTN,
+                       1, "21233445566",
+                       "+121233445566",
+                       "+1 21233445566",
+                       "21233445566",
+                       "tel:+1-21233445566"),
+               test_parse_and_format,
+               parse_and_format_data_free);
        g_test_add_data_func_full (
-               "/ebook-phone-number/parse-and-format/rfc3966", parse_and_format_data_new (
-               "tel:+358-71-44556677", NULL,
-               E_PHONE_NUMBER_COUNTRY_FROM_FQTN, 358, "7144556677",
-               "+3587144556677", "+358 71 44556677", "071 44556677", "tel:+358-71-44556677"),
-               test_parse_and_format, parse_and_format_data_free);
+               "/ebook-phone-number/parse-and-format/rfc3966",
+               parse_and_format_data_new (
+                       "tel:+358-71-44556677", NULL,
+                       E_PHONE_NUMBER_COUNTRY_FROM_FQTN,
+                       358, "7144556677",
+                       "+3587144556677",
+                       "+358 71 44556677",
+                       "071 44556677",
+                       "tel:+358-71-44556677"),
+               test_parse_and_format,
+               parse_and_format_data_free);
 
        g_test_add_func (
                "/ebook-phone-number/parse-and-format/bad-number",
@@ -468,7 +499,10 @@ main (gint argc,
                                "/ebook-phone-number/compare/%s/%s",
                                match_candidates[i], match_candidates[j]);
 
-                       g_test_add_data_func (path, GUINT_TO_POINTER (n), test_compare_numbers);
+                       g_test_add_data_func (
+                               path,
+                               GUINT_TO_POINTER (n),
+                               test_compare_numbers);
                        g_free (path);
                }
        }
diff --git a/tests/libebook-contacts/test-query.c b/tests/libebook-contacts/test-query.c
index cf46606..dff9520 100644
--- a/tests/libebook-contacts/test-query.c
+++ b/tests/libebook-contacts/test-query.c
@@ -88,6 +88,7 @@ main (gint argc,
        g_type_init ();
 
        g_test_init (&argc, &argv, NULL);
+       g_test_bug_base ("http://bugzilla.gnome.org/";);
 
        setlocale (LC_ADDRESS, "en_US.UTF-8");
 
diff --git a/tests/libebook-contacts/test-untyped-phones.c b/tests/libebook-contacts/test-untyped-phones.c
index 0f520ef..828462b 100644
--- a/tests/libebook-contacts/test-untyped-phones.c
+++ b/tests/libebook-contacts/test-untyped-phones.c
@@ -50,6 +50,7 @@ main (gint argc,
        g_type_init ();
 
        g_test_init (&argc, &argv, NULL);
+       g_test_bug_base ("http://bugzilla.gnome.org/";);
 
 #if 0   /* This is failing for some reason, somewhere in EDS history it broke,
         * for now I'm leaving the compiler warning in place intentionally
diff --git a/tests/libebook-contacts/test-vcard-parsing.c b/tests/libebook-contacts/test-vcard-parsing.c
index a205ed4..bd85f87 100644
--- a/tests/libebook-contacts/test-vcard-parsing.c
+++ b/tests/libebook-contacts/test-vcard-parsing.c
@@ -219,7 +219,7 @@ test_econtact (const gchar *vcard_str)
        return TRUE;
 }
 
-static const gchar *test_vcard_no_uid_str = 
+static const gchar *test_vcard_no_uid_str =
        "BEGIN:VCARD\r\n"
        "VERSION:3.0\r\n"
        "EMAIL;TYPE=OTHER:zyx no where\r\n"
@@ -227,7 +227,7 @@ static const gchar *test_vcard_no_uid_str =
        "N:zyx;mix;;;\r\n"
        "END:VCARD";
 
-static const gchar *test_vcard_with_uid_str = 
+static const gchar *test_vcard_with_uid_str =
        "BEGIN:VCARD\r\n"
        "VERSION:3.0\r\n"
        "UID:some-uid\r\n"
@@ -236,7 +236,6 @@ static const gchar *test_vcard_with_uid_str =
        "N:zyx;mix;;;\r\n"
        "END:VCARD";
 
-
 static void
 test_vcard_with_uid (void)
 {
@@ -268,6 +267,7 @@ main (gint argc,
        g_type_init ();
 
        g_test_init (&argc, &argv, NULL);
+       g_test_bug_base ("http://bugzilla.gnome.org/";);
 
        g_test_add_func ("/Parsing/VCard/WithUID", test_vcard_with_uid);
        g_test_add_func ("/Parsing/VCard/WithoutUID", test_vcard_without_uid);
diff --git a/tests/libebook/client/test-client-add-and-get-async.c 
b/tests/libebook/client/test-client-add-and-get-async.c
index 29db28b..2f48767 100644
--- a/tests/libebook/client/test-client-add-and-get-async.c
+++ b/tests/libebook/client/test-client-add-and-get-async.c
@@ -14,7 +14,6 @@ static gint fetched_contacts = 0;
 static gint fetched_uids = 0;
 static gint added_contacts = 0;
 
-
 static void
 count_all_uids_cb (GObject *source_object,
                    GAsyncResult *result,
@@ -41,8 +40,8 @@ count_all_uids_cb (GObject *source_object,
 
 static void
 count_all_contacts_cb (GObject *source_object,
-                      GAsyncResult *result,
-                      gpointer user_data)
+                       GAsyncResult *result,
+                       gpointer user_data)
 {
        EBookClient *book_client;
        EBookQuery *query;
@@ -73,7 +72,7 @@ count_all_contacts_cb (GObject *source_object,
 
 static void
 count_all_contacts (EBookClient *book_client,
-                   GMainLoop *loop)
+                    GMainLoop *loop)
 {
        EBookQuery *query;
        gchar *sexp;
@@ -89,8 +88,8 @@ count_all_contacts (EBookClient *book_client,
 
 static void
 get_contact_cb (GObject *source_object,
-               GAsyncResult *result,
-               gpointer user_data)
+                GAsyncResult *result,
+                gpointer user_data)
 {
        EBookClient *book_client;
        EContact *contact = NULL;
@@ -111,8 +110,8 @@ get_contact_cb (GObject *source_object,
 
 static void
 get_contact_async (EBookClient *book_client,
-                  GSList *uids,
-                  GMainLoop *loop)
+                   GSList *uids,
+                   GMainLoop *loop)
 {
        const gchar *uid = uids->data;
 
@@ -202,10 +201,15 @@ main (gint argc,
        g_type_init ();
 #endif
        g_test_init (&argc, &argv, NULL);
+       g_test_bug_base ("http://bugzilla.gnome.org/";);
 
        g_test_add (
-               "/EBookClient/AddAndGet/Async", ETestServerFixture, &book_closure,
-               e_test_server_utils_setup, test_async, e_test_server_utils_teardown);
+               "/EBookClient/AddAndGet/Async",
+               ETestServerFixture,
+               &book_closure,
+               e_test_server_utils_setup,
+               test_async,
+               e_test_server_utils_teardown);
 
        return e_test_server_utils_run ();
 }
diff --git a/tests/libebook/client/test-client-add-and-get-sync.c 
b/tests/libebook/client/test-client-add-and-get-sync.c
index 3b126ab..45ecec5 100644
--- a/tests/libebook/client/test-client-add-and-get-sync.c
+++ b/tests/libebook/client/test-client-add-and-get-sync.c
@@ -93,10 +93,15 @@ main (gint argc,
        g_type_init ();
 #endif
        g_test_init (&argc, &argv, NULL);
+       g_test_bug_base ("http://bugzilla.gnome.org/";);
 
        g_test_add (
-               "/EBookClient/AddAndGet/Sync", ETestServerFixture, &book_closure,
-               e_test_server_utils_setup, test_client, e_test_server_utils_teardown);
+               "/EBookClient/AddAndGet/Sync",
+               ETestServerFixture,
+               &book_closure,
+               e_test_server_utils_setup,
+               test_client,
+               e_test_server_utils_teardown);
 
        return e_test_server_utils_run ();
 }
diff --git a/tests/libebook/client/test-client-add-contact.c b/tests/libebook/client/test-client-add-contact.c
index 88015a2..62fc0a9 100644
--- a/tests/libebook/client/test-client-add-contact.c
+++ b/tests/libebook/client/test-client-add-contact.c
@@ -69,13 +69,22 @@ main (gint argc,
        g_type_init ();
 #endif
        g_test_init (&argc, &argv, NULL);
+       g_test_bug_base ("http://bugzilla.gnome.org/";);
 
        g_test_add (
-               "/EBookClient/AddContact/Sync", ETestServerFixture, &book_closure,
-               e_test_server_utils_setup, test_add_contact_sync, e_test_server_utils_teardown);
+               "/EBookClient/AddContact/Sync",
+               ETestServerFixture,
+               &book_closure,
+               e_test_server_utils_setup,
+               test_add_contact_sync,
+               e_test_server_utils_teardown);
        g_test_add (
-               "/EBookClient/AddContact/Async", ETestServerFixture, &book_closure,
-               e_test_server_utils_setup, test_add_contact_async, e_test_server_utils_teardown);
+               "/EBookClient/AddContact/Async",
+               ETestServerFixture,
+               &book_closure,
+               e_test_server_utils_setup,
+               test_add_contact_async,
+               e_test_server_utils_teardown);
 
        return e_test_server_utils_run ();
 }
diff --git a/tests/libebook/client/test-client-custom-summary.c 
b/tests/libebook/client/test-client-custom-summary.c
index cadb398..bf1add3 100644
--- a/tests/libebook/client/test-client-custom-summary.c
+++ b/tests/libebook/client/test-client-custom-summary.c
@@ -337,6 +337,7 @@ main (gint argc,
        g_type_init ();
 #endif
        g_test_init (&argc, &argv, NULL);
+       g_test_bug_base ("http://bugzilla.gnome.org/";);
 
        /* Change environment so that the addressbook factory inherits this setting */
        g_setenv ("LC_ALL", "en_US.UTF-8", TRUE);
@@ -350,162 +351,304 @@ main (gint argc,
 
                /* A query that will cause e_sexp_parse() to report an error */
                add_client_test_sexp (
-                       suites[i].prefix, "/InvalidQuery", suites[i].func,
+                       suites[i].prefix,
+                       "/InvalidQuery",
+                       suites[i].func,
                        g_strdup ("(invalid \"query\" \"term\")"),
-                       -1, suites[i].direct, suites[i].custom, FALSE);
+                       -1,
+                       suites[i].direct,
+                       suites[i].custom,
+                       FALSE);
 
                /* Add search tests that fetch contacts */
                add_client_test (
-                       suites[i].prefix, "/Exact/FullName", suites[i].func,
-                       e_book_query_field_test (E_CONTACT_FULL_NAME, E_BOOK_QUERY_IS, "James Brown"),
-                       1, suites[i].direct, suites[i].custom, FALSE);
+                       suites[i].prefix,
+                       "/Exact/FullName",
+                       suites[i].func,
+                       e_book_query_field_test (
+                               E_CONTACT_FULL_NAME,
+                               E_BOOK_QUERY_IS,
+                               "James Brown"),
+                       1,
+                       suites[i].direct,
+                       suites[i].custom,
+                       FALSE);
 
                add_client_test (
-                       suites[i].prefix, "/Exact/Name", suites[i].func,
-                       e_book_query_vcard_field_test (EVC_N, E_BOOK_QUERY_IS, "Janet"),
-                       1, suites[i].direct, suites[i].custom, FALSE);
+                       suites[i].prefix,
+                       "/Exact/Name",
+                       suites[i].func,
+                       e_book_query_vcard_field_test (
+                               EVC_N,
+                               E_BOOK_QUERY_IS,
+                               "Janet"),
+                       1,
+                       suites[i].direct,
+                       suites[i].custom,
+                       FALSE);
 
                add_client_test (
-                       suites[i].prefix, "/Prefix/FullName", suites[i].func,
-                       e_book_query_field_test (E_CONTACT_FULL_NAME, E_BOOK_QUERY_BEGINS_WITH, "B"),
-                       2, suites[i].direct, suites[i].custom, FALSE);
+                       suites[i].prefix,
+                       "/Prefix/FullName",
+                       suites[i].func,
+                       e_book_query_field_test (
+                               E_CONTACT_FULL_NAME,
+                               E_BOOK_QUERY_BEGINS_WITH,
+                               "B"),
+                       2,
+                       suites[i].direct,
+                       suites[i].custom,
+                       FALSE);
 
                add_client_test (
-                       suites[i].prefix, "/Prefix/FullName/Percent", suites[i].func,
-                       e_book_query_field_test (E_CONTACT_FULL_NAME, E_BOOK_QUERY_BEGINS_WITH, "%"),
-                       1, suites[i].direct, suites[i].custom, FALSE);
-
-               /* Query the E_CONTACT_TEL field for something that is not a phone number, user is
-                * searching for all the contacts when they noted they must ask Jenny for the phone number
-                */
+                       suites[i].prefix,
+                       "/Prefix/FullName/Percent",
+                       suites[i].func,
+                       e_book_query_field_test (
+                               E_CONTACT_FULL_NAME,
+                               E_BOOK_QUERY_BEGINS_WITH,
+                               "%"),
+                       1,
+                       suites[i].direct,
+                       suites[i].custom,
+                       FALSE);
+
+               /* Query the E_CONTACT_TEL field for something that is not a
+                * phone number, user is searching for all the contacts when
+                * they noted they must ask Jenny for the phone number. */
                add_client_test (
-                       suites[i].prefix, "/Prefix/Phone/NotAPhoneNumber", suites[i].func,
-                       e_book_query_field_test (E_CONTACT_TEL, E_BOOK_QUERY_BEGINS_WITH, "ask Jenny"),
-                       1, suites[i].direct, suites[i].custom, FALSE);
+                       suites[i].prefix,
+                       "/Prefix/Phone/NotAPhoneNumber",
+                       suites[i].func,
+                       e_book_query_field_test (
+                               E_CONTACT_TEL,
+                               E_BOOK_QUERY_BEGINS_WITH,
+                               "ask Jenny"),
+                       1,
+                       suites[i].direct,
+                       suites[i].custom,
+                       FALSE);
 
                add_client_test (
-                       suites[i].prefix, "/Suffix/Phone", suites[i].func,
-                       e_book_query_field_test (E_CONTACT_TEL, E_BOOK_QUERY_ENDS_WITH, "999"),
-                       2, suites[i].direct, suites[i].custom, FALSE);
-
-               /* This test proves that we do not get any results for custom-7.vcf, which contains
-                * a phone number ending with "88 99", if this were accidentally normalized, we would
-                * get a result for it.
-                */
+                       suites[i].prefix,
+                       "/Suffix/Phone",
+                       suites[i].func,
+                       e_book_query_field_test (
+                               E_CONTACT_TEL,
+                               E_BOOK_QUERY_ENDS_WITH,
+                               "999"),
+                       2,
+                       suites[i].direct,
+                       suites[i].custom,
+                       FALSE);
+
+               /* This test proves that we do not get any results for
+                * custom-7.vcf, which contains a phone number ending with
+                * "88 99", if this were accidentally normalized, we would
+                * get a result for it. */
                add_client_test (
-                       suites[i].prefix, "/Suffix/Phone/NotNormalized", suites[i].func,
-                       e_book_query_field_test (E_CONTACT_TEL, E_BOOK_QUERY_ENDS_WITH, "8899"),
-                       0, suites[i].direct, suites[i].custom, FALSE);
+                       suites[i].prefix,
+                       "/Suffix/Phone/NotNormalized",
+                       suites[i].func,
+                       e_book_query_field_test (
+                               E_CONTACT_TEL,
+                               E_BOOK_QUERY_ENDS_WITH,
+                               "8899"),
+                       0,
+                       suites[i].direct,
+                       suites[i].custom,
+                       FALSE);
 
                add_client_test (
-                       suites[i].prefix, "/Suffix/Email", suites[i].func,
-                       e_book_query_field_test (E_CONTACT_EMAIL, E_BOOK_QUERY_ENDS_WITH, "jackson.com"),
-                       2, suites[i].direct, suites[i].custom, FALSE);
+                       suites[i].prefix,
+                       "/Suffix/Email",
+                       suites[i].func,
+                       e_book_query_field_test (
+                               E_CONTACT_EMAIL,
+                               E_BOOK_QUERY_ENDS_WITH,
+                               "jackson.com"),
+                       2,
+                       suites[i].direct,
+                       suites[i].custom,
+                       FALSE);
 
                /*********************************************
                 *         PHONE NUMBER QUERIES FOLLOW       *
                 *********************************************/
 
-               /* Expect E_CLIENT_ERROR_INVALID_QUERY, "ask Jenny for Lisa's number" was entered
-                * for contact-6.vcf, it can be searched using normal E_BOOK_QUERY_* queries but
-                * treating it as a phone number is an invalid query.
-                */
+               /* Expect E_CLIENT_ERROR_INVALID_QUERY, "ask Jenny for
+                * Lisa's number" was entered for contact-6.vcf, it can
+                * be searched using normal E_BOOK_QUERY_* queries but
+                * treating it as a phone number is an invalid query. */
                add_client_test (
-                       suites[i].prefix, "/EqPhone/InvalidPhoneNumber", suites[i].func,
-                       e_book_query_field_test (E_CONTACT_TEL,
-                       E_BOOK_QUERY_EQUALS_PHONE_NUMBER,
-                       "ask Jenny for Lisa's number"),
-                       -1, suites[i].direct, suites[i].custom, TRUE);
-
-               /* These queries will do an index lookup with a custom summary, and a full table scan
-                * matching with EBookBackendSexp when the default summary is used
-                */
+                       suites[i].prefix,
+                       "/EqPhone/InvalidPhoneNumber",
+                       suites[i].func,
+                       e_book_query_field_test (
+                               E_CONTACT_TEL,
+                               E_BOOK_QUERY_EQUALS_PHONE_NUMBER,
+                               "ask Jenny for Lisa's number"),
+                       -1,
+                       suites[i].direct,
+                       suites[i].custom,
+                       TRUE);
+
+               /* These queries will do an index lookup with a custom summary,
+                * and a full table scan matching with EBookBackendSexp when
+                * the default summary is used. */
                add_client_test (
-                       suites[i].prefix, "/EqPhone/Exact/Common", suites[i].func,
-                       e_book_query_field_test (E_CONTACT_TEL, E_BOOK_QUERY_EQUALS_PHONE_NUMBER, "+1 
221.542.3789"),
-                       1, suites[i].direct, suites[i].custom, TRUE);
-
-               /* This test checks that phone number matching works when deeply nested into a query, when 
ENABLE_PHONENUMBER
-                * is not defined, then it ensures that the query is refused while being deeply nested.
-                */
+                       suites[i].prefix,
+                       "/EqPhone/Exact/Common",
+                       suites[i].func,
+                       e_book_query_field_test (
+                               E_CONTACT_TEL,
+                               E_BOOK_QUERY_EQUALS_PHONE_NUMBER,
+                               "+1 221.542.3789"),
+                       1,
+                       suites[i].direct,
+                       suites[i].custom,
+                       TRUE);
+
+               /* This test checks that phone number matching works when
+                * deeply nested into a query, when ENABLE_PHONENUMBER is
+                * not defined, then it ensures that the query is refused
+                * while being deeply nested. */
                add_client_test (
-                       suites[i].prefix, "/EqPhone/Exact/Nested", suites[i].func,
+                       suites[i].prefix,
+                       "/EqPhone/Exact/Nested",
+                       suites[i].func,
                        e_book_query_orv (
-                       e_book_query_field_test (E_CONTACT_FULL_NAME, E_BOOK_QUERY_IS, "Not In The Summary"),
-                       e_book_query_field_test (E_CONTACT_EMAIL, E_BOOK_QUERY_IS, "not in the summary com"),
-                       e_book_query_andv (
-                       e_book_query_field_test (E_CONTACT_FULL_NAME,
-                       E_BOOK_QUERY_BEGINS_WITH, "Micheal"),
-                       e_book_query_field_test (E_CONTACT_TEL,
-                       E_BOOK_QUERY_EQUALS_PHONE_NUMBER, "+1 221.542.3789"),
-                       NULL),
-                       NULL),
-                       1, suites[i].direct, suites[i].custom, TRUE);
+                               e_book_query_field_test (
+                                       E_CONTACT_FULL_NAME,
+                                       E_BOOK_QUERY_IS,
+                                       "Not In The Summary"),
+                               e_book_query_field_test (
+                                       E_CONTACT_EMAIL,
+                                       E_BOOK_QUERY_IS,
+                                       "not in the summary com"),
+                               e_book_query_andv (
+                                       e_book_query_field_test (
+                                               E_CONTACT_FULL_NAME,
+                                               E_BOOK_QUERY_BEGINS_WITH,
+                                               "Micheal"),
+                                       e_book_query_field_test (
+                                               E_CONTACT_TEL,
+                                               E_BOOK_QUERY_EQUALS_PHONE_NUMBER,
+                                               "+1 221.542.3789"),
+                                       NULL),
+                               NULL),
+                       1,
+                       suites[i].direct,
+                       suites[i].custom,
+                       TRUE);
 
                /*********************************************
                 * E_BOOK_QUERY_EQUALS_NATIONAL_PHONE_NUMBER *
                 *********************************************/
 
-               /* Test that a query term with no specified country returns all vCards that 
-                * have the same national number regardless of country codes.
+               /* Test that a query term with no specified country returns
+                * all vCards that have the same national number regardless
+                * of country codes.
                 *
                 * | Active Country Code: +1 | Query: 221.542.3789 | vCard Data: +1-221-5423789 | Matches: 
yes |
                 * | Active Country Code: +1 | Query: 221.542.3789 | vCard Data: +31-221-5423789 | Matches: 
no  |
                 */
                add_client_test (
-                       suites[i].prefix, "/EqPhone/National/Common", suites[i].func,
-                       e_book_query_field_test (E_CONTACT_TEL, E_BOOK_QUERY_EQUALS_NATIONAL_PHONE_NUMBER, 
"221.542.3789"),
-                       1, suites[i].direct, suites[i].custom, TRUE);
-
-               /* Test that a query term with a specified country returns only vCards that 
-                * are specifically in the specified country code.
+                       suites[i].prefix,
+                       "/EqPhone/National/Common",
+                       suites[i].func,
+                       e_book_query_field_test (
+                               E_CONTACT_TEL,
+                               E_BOOK_QUERY_EQUALS_NATIONAL_PHONE_NUMBER,
+                               "221.542.3789"),
+                       1,
+                       suites[i].direct,
+                       suites[i].custom,
+                       TRUE);
+
+               /* Test that a query term with a specified country returns
+                * only vCards that are specifically in the specified country
+                * code.
                 *
                 * | Active Country Code: +1 | Query: +49 221.542.3789 | vCard Data: +1-221-5423789 | 
Matches: no |
                 * | Active Country Code: +1 | Query: +49 221.542.3789 | vCard Data: +31-221-5423789 | 
Matches: no |
                 */
                add_client_test (
-                       suites[i].prefix, "/EqPhone/National/CountryMismatch", suites[i].func,
-                       e_book_query_field_test (E_CONTACT_TEL,
-                       E_BOOK_QUERY_EQUALS_NATIONAL_PHONE_NUMBER, "+49 221.542.3789"),
-                       0, suites[i].direct, suites[i].custom, TRUE);
-
-               /* Test that a query term with the active country code specified returns a vCard with an 
unspecified
-                * country code.
+                       suites[i].prefix,
+                       "/EqPhone/National/CountryMismatch",
+                       suites[i].func,
+                       e_book_query_field_test (
+                               E_CONTACT_TEL,
+                               E_BOOK_QUERY_EQUALS_NATIONAL_PHONE_NUMBER,
+                               "+49 221.542.3789"),
+                       0,
+                       suites[i].direct,
+                       suites[i].custom,
+                       TRUE);
+
+               /* Test that a query term with the active country code
+                * specified returns a vCard with an unspecified country code.
                 *
                 * | Active Country Code: +1 | Query: +1 514-845-8436 | vCard Data: 514-845-8436 | Matches: 
yes |
                 */
                add_client_test (
-                       suites[i].prefix, "/EqPhone/National/CountryAbsent/QueryWithCountry", suites[i].func,
-                       e_book_query_field_test (E_CONTACT_TEL,
-                       E_BOOK_QUERY_EQUALS_NATIONAL_PHONE_NUMBER, "+1 514-845-8436"),
-                       1, suites[i].direct, suites[i].custom, TRUE);
-
-               /* Test that a query term with an arbitrary country code specified returns a vCard with an 
unspecified
-                * country code.
+                       suites[i].prefix,
+                       "/EqPhone/National/CountryAbsent/QueryWithCountry",
+                       suites[i].func,
+                       e_book_query_field_test (
+                               E_CONTACT_TEL,
+                               E_BOOK_QUERY_EQUALS_NATIONAL_PHONE_NUMBER,
+                               "+1 514-845-8436"),
+                       1,
+                       suites[i].direct,
+                       suites[i].custom,
+                       TRUE);
+
+               /* Test that a query term with an arbitrary country code
+                * specified returns a vCard with an unspecified country code.
                 *
                 * | Active Country Code: +1 | Query: +49 514-845-8436 | vCard Data: 514-845-8436 | Matches: 
yes |
                 */
                add_client_test (
-                       suites[i].prefix, "/EqPhone/National/CountryAbsent/QueryOtherCountry", suites[i].func,
-                       e_book_query_field_test (E_CONTACT_TEL, E_BOOK_QUERY_EQUALS_NATIONAL_PHONE_NUMBER, 
"+49 514-845-8436"),
-                       0, suites[i].direct, suites[i].custom, TRUE);
+                       suites[i].prefix,
+                       "/EqPhone/National/CountryAbsent/QueryOtherCountry",
+                       suites[i].func,
+                       e_book_query_field_test (
+                               E_CONTACT_TEL,
+                               E_BOOK_QUERY_EQUALS_NATIONAL_PHONE_NUMBER,
+                               "+49 514-845-8436"),
+                       0,
+                       suites[i].direct,
+                       suites[i].custom,
+                       TRUE);
 
                add_client_test (
-                       suites[i].prefix, "/EqPhone/Short", suites[i].func,
-                       e_book_query_field_test (E_CONTACT_TEL, E_BOOK_QUERY_EQUALS_SHORT_PHONE_NUMBER, 
"5423789"),
-                       1, suites[i].direct, suites[i].custom, TRUE);
-
+                       suites[i].prefix,
+                       "/EqPhone/Short",
+                       suites[i].func,
+                       e_book_query_field_test (
+                               E_CONTACT_TEL,
+                               E_BOOK_QUERY_EQUALS_SHORT_PHONE_NUMBER,
+                               "5423789"),
+                       1,
+                       suites[i].direct,
+                       suites[i].custom,
+                       TRUE);
        }
 
 #ifdef ENABLE_PHONENUMBER
 #if 0 /* FIXME: This test is broken */
 
        add_client_test (
-               "/EBookClient", "/EqPhone/LocaleChange", locale_change_test,
+               "/EBookClient",
+               "/EqPhone/LocaleChange",
+               locale_change_test,
                NULL, 0, FALSE, TRUE);
 
        add_client_test (
-               "/EBookClient/DirectAccess", "/EqPhone/LocaleChange", locale_change_test,
+               "/EBookClient/DirectAccess",
+               "/EqPhone/LocaleChange",
+               locale_change_test,
                NULL, 0, TRUE, TRUE);
 #endif
 #endif /* ENABLE_PHONENUMBER */
diff --git a/tests/libebook/client/test-client-e164-param.c b/tests/libebook/client/test-client-e164-param.c
index 944e390..f96d5af 100644
--- a/tests/libebook/client/test-client-e164-param.c
+++ b/tests/libebook/client/test-client-e164-param.c
@@ -138,28 +138,53 @@ main (gint argc,
        g_type_init ();
 #endif
        g_test_init (&argc, &argv, NULL);
+       g_test_bug_base ("http://bugzilla.gnome.org/";);
 
 #ifdef ENABLE_PHONENUMBER
 
        g_test_add (
-               "/EBookClient/AddContact/AddE164Param/1", ETestServerFixture,
-               test_data_new ("custom-1", "+1-221-5423789", "+1", "2215423789", FALSE),
-               e_test_server_utils_setup, test_add_e164_param,
+               "/EBookClient/AddContact/AddE164Param/1",
+               ETestServerFixture,
+               test_data_new (
+                       "custom-1",
+                       "+1-221-5423789",
+                       "+1", "2215423789",
+                       FALSE),
+               e_test_server_utils_setup,
+               test_add_e164_param,
                e_test_server_utils_teardown);
        g_test_add (
-               "/EBookClient/AddContact/AddE164Param/2", ETestServerFixture,
-               test_data_new ("custom-2", "7654321", NULL, "7654321", FALSE),
-               e_test_server_utils_setup, test_add_e164_param,
+               "/EBookClient/AddContact/AddE164Param/2",
+               ETestServerFixture,
+               test_data_new (
+                       "custom-2",
+                       "7654321",
+                       NULL, "7654321",
+                       FALSE),
+               e_test_server_utils_setup,
+               test_add_e164_param,
                e_test_server_utils_teardown);
        g_test_add (
-               "/EBookClient/DirectAccess/AddContact/AddE164Param/1", ETestServerFixture,
-               test_data_new ("custom-1", "+1-221-5423789", "+1", "2215423789", TRUE),
-               e_test_server_utils_setup, test_add_e164_param,
+               "/EBookClient/DirectAccess/AddContact/AddE164Param/1",
+               ETestServerFixture,
+               test_data_new (
+                       "custom-1",
+                       "+1-221-5423789",
+                       "+1", "2215423789",
+                       TRUE),
+               e_test_server_utils_setup,
+               test_add_e164_param,
                e_test_server_utils_teardown);
        g_test_add (
-               "/EBookClient/DirectAccess/AddContact/AddE164Param/2", ETestServerFixture,
-               test_data_new ("custom-2", "7654321", NULL, "7654321", TRUE),
-               e_test_server_utils_setup, test_add_e164_param,
+               "/EBookClient/DirectAccess/AddContact/AddE164Param/2",
+               ETestServerFixture,
+               test_data_new (
+                       "custom-2",
+                       "7654321",
+                       NULL, "7654321",
+                       TRUE),
+               e_test_server_utils_setup,
+               test_add_e164_param,
                e_test_server_utils_teardown);
 
 #endif /* ENABLE_PHONENUMBER */
diff --git a/tests/libebook/client/test-client-get-contact-uids.c 
b/tests/libebook/client/test-client-get-contact-uids.c
index 4fc8667..c7f435f 100644
--- a/tests/libebook/client/test-client-get-contact-uids.c
+++ b/tests/libebook/client/test-client-get-contact-uids.c
@@ -97,19 +97,36 @@ main (gint argc,
        g_type_init ();
 #endif
        g_test_init (&argc, &argv, NULL);
+       g_test_bug_base ("http://bugzilla.gnome.org/";);
 
        g_test_add (
-               "/EBookClient/GetContactUids/Sync", ETestServerFixture, &book_closure,
-               e_test_server_utils_setup, test_get_contact_uids_sync, e_test_server_utils_teardown);
+               "/EBookClient/GetContactUids/Sync",
+               ETestServerFixture,
+               &book_closure,
+               e_test_server_utils_setup,
+               test_get_contact_uids_sync,
+               e_test_server_utils_teardown);
        g_test_add (
-               "/EBookClient/GetContactUids/Async", ETestServerFixture, &book_closure,
-               e_test_server_utils_setup, test_get_contact_uids_async, e_test_server_utils_teardown);
+               "/EBookClient/GetContactUids/Async",
+               ETestServerFixture,
+               &book_closure,
+               e_test_server_utils_setup,
+               test_get_contact_uids_async,
+               e_test_server_utils_teardown);
        g_test_add (
-               "/EBookClient/DirectAccess/GetContactUids/Sync", ETestServerFixture, &direct_book_closure,
-               e_test_server_utils_setup, test_get_contact_uids_sync, e_test_server_utils_teardown);
+               "/EBookClient/DirectAccess/GetContactUids/Sync",
+               ETestServerFixture,
+               &direct_book_closure,
+               e_test_server_utils_setup,
+               test_get_contact_uids_sync,
+               e_test_server_utils_teardown);
        g_test_add (
-               "/EBookClient/DirectAccess/GetContactUids/Async", ETestServerFixture, &direct_book_closure,
-               e_test_server_utils_setup, test_get_contact_uids_async, e_test_server_utils_teardown);
+               "/EBookClient/DirectAccess/GetContactUids/Async",
+               ETestServerFixture,
+               &direct_book_closure,
+               e_test_server_utils_setup,
+               test_get_contact_uids_async,
+               e_test_server_utils_teardown);
 
        return e_test_server_utils_run ();
 }
diff --git a/tests/libebook/client/test-client-get-contact.c b/tests/libebook/client/test-client-get-contact.c
index b725cd3..831e050 100644
--- a/tests/libebook/client/test-client-get-contact.c
+++ b/tests/libebook/client/test-client-get-contact.c
@@ -72,19 +72,36 @@ main (gint argc,
        g_type_init ();
 #endif
        g_test_init (&argc, &argv, NULL);
+       g_test_bug_base ("http://bugzilla.gnome.org/";);
 
        g_test_add (
-               "/EBookClient/GetContact/Sync", ETestServerFixture, &book_closure,
-               e_test_server_utils_setup, test_get_contact_sync, e_test_server_utils_teardown);
+               "/EBookClient/GetContact/Sync",
+               ETestServerFixture,
+               &book_closure,
+               e_test_server_utils_setup,
+               test_get_contact_sync,
+               e_test_server_utils_teardown);
        g_test_add (
-               "/EBookClient/GetContact/Async", ETestServerFixture, &book_closure,
-               e_test_server_utils_setup, test_get_contact_async, e_test_server_utils_teardown);
+               "/EBookClient/GetContact/Async",
+               ETestServerFixture,
+               &book_closure,
+               e_test_server_utils_setup,
+               test_get_contact_async,
+               e_test_server_utils_teardown);
        g_test_add (
-               "/EBookClient/DirectAccess/GetContact/Sync", ETestServerFixture, &direct_book_closure,
-               e_test_server_utils_setup, test_get_contact_sync, e_test_server_utils_teardown);
+               "/EBookClient/DirectAccess/GetContact/Sync",
+               ETestServerFixture,
+               &direct_book_closure,
+               e_test_server_utils_setup,
+               test_get_contact_sync,
+               e_test_server_utils_teardown);
        g_test_add (
-               "/EBookClient/DirectAccess/GetContact/Async", ETestServerFixture, &direct_book_closure,
-               e_test_server_utils_setup, test_get_contact_async, e_test_server_utils_teardown);
+               "/EBookClient/DirectAccess/GetContact/Async",
+               ETestServerFixture,
+               &direct_book_closure,
+               e_test_server_utils_setup,
+               test_get_contact_async,
+               e_test_server_utils_teardown);
 
        return e_test_server_utils_run ();
 }
diff --git a/tests/libebook/client/test-client-get-revision.c 
b/tests/libebook/client/test-client-get-revision.c
index 5a2d8f1..c31e6f9 100644
--- a/tests/libebook/client/test-client-get-revision.c
+++ b/tests/libebook/client/test-client-get-revision.c
@@ -14,12 +14,12 @@ static ETestServerClosure book_closure = { E_TEST_SERVER_ADDRESS_BOOK, NULL, 0 }
 static void
 get_revision_compare_cycle (EBookClient *client)
 {
-       gchar    *revision_before = NULL, *revision_after = NULL;
-       EContact *contact = NULL;
-       GError   *error = NULL;
+       gchar    *revision_before = NULL, *revision_after = NULL;
+       EContact *contact = NULL;
+       GError   *error = NULL;
 
-       if (!e_client_get_backend_property_sync (E_CLIENT (client), CLIENT_BACKEND_PROPERTY_REVISION, 
&revision_before, NULL, &error))
-              g_error ("Error getting book revision: %s", error->message);
+       if (!e_client_get_backend_property_sync (E_CLIENT (client), CLIENT_BACKEND_PROPERTY_REVISION, 
&revision_before, NULL, &error))
+               g_error ("Error getting book revision: %s", error->message);
 
        if (!add_contact_from_test_case_verify (client, "simple-1", &contact)) {
                g_object_unref (client);
@@ -31,18 +31,19 @@ get_revision_compare_cycle (EBookClient *client)
 
        g_object_unref (contact);
 
-       if (!e_client_get_backend_property_sync (E_CLIENT (client), CLIENT_BACKEND_PROPERTY_REVISION, 
&revision_after, NULL, &error))
-              g_error ("Error getting book revision: %s", error->message);
+       if (!e_client_get_backend_property_sync (E_CLIENT (client), CLIENT_BACKEND_PROPERTY_REVISION, 
&revision_after, NULL, &error))
+               g_error ("Error getting book revision: %s", error->message);
 
-       g_assert (revision_before);
-       g_assert (revision_after);
-       g_assert (strcmp (revision_before, revision_after) != 0);
+       g_assert (revision_before);
+       g_assert (revision_after);
+       g_assert (strcmp (revision_before, revision_after) != 0);
 
-       g_message ("Passed cycle, revision before '%s' revision after '%s'",
-                 revision_before, revision_after);
+       g_message (
+               "Passed cycle, revision before '%s' revision after '%s'",
+               revision_before, revision_after);
 
-       g_free (revision_before);
-       g_free (revision_after);
+       g_free (revision_before);
+       g_free (revision_after);
 }
 
 static void
@@ -67,10 +68,15 @@ main (gint argc,
        g_type_init ();
 #endif
        g_test_init (&argc, &argv, NULL);
+       g_test_bug_base ("http://bugzilla.gnome.org/";);
 
        g_test_add (
-               "/EBookClient/GetRevision", ETestServerFixture, &book_closure,
-               e_test_server_utils_setup, test_get_revision, e_test_server_utils_teardown);
+               "/EBookClient/GetRevision",
+               ETestServerFixture,
+               &book_closure,
+               e_test_server_utils_setup,
+               test_get_revision,
+               e_test_server_utils_teardown);
 
        return e_test_server_utils_run ();
 }
diff --git a/tests/libebook/client/test-client-get-view.c b/tests/libebook/client/test-client-get-view.c
index 8a9832d..2917447 100644
--- a/tests/libebook/client/test-client-get-view.c
+++ b/tests/libebook/client/test-client-get-view.c
@@ -147,19 +147,36 @@ main (gint argc,
        g_type_init ();
 #endif
        g_test_init (&argc, &argv, NULL);
+       g_test_bug_base ("http://bugzilla.gnome.org/";);
 
        g_test_add (
-               "/EBookClient/GetBookClientView/Sync", ETestServerFixture, &book_closure,
-               e_test_server_utils_setup, test_get_view_sync, e_test_server_utils_teardown);
+               "/EBookClient/GetBookClientView/Sync",
+               ETestServerFixture,
+               &book_closure,
+               e_test_server_utils_setup,
+               test_get_view_sync,
+               e_test_server_utils_teardown);
        g_test_add (
-               "/EBookClient/GetBookClientView/Async", ETestServerFixture, &book_closure,
-               e_test_server_utils_setup, test_get_view_async, e_test_server_utils_teardown);
+               "/EBookClient/GetBookClientView/Async",
+               ETestServerFixture,
+               &book_closure,
+               e_test_server_utils_setup,
+               test_get_view_async,
+               e_test_server_utils_teardown);
        g_test_add (
-               "/EBookClient/DirectAccess/GetBookClientView/Sync", ETestServerFixture, &direct_book_closure,
-               e_test_server_utils_setup, test_get_view_sync, e_test_server_utils_teardown);
+               "/EBookClient/DirectAccess/GetBookClientView/Sync",
+               ETestServerFixture,
+               &direct_book_closure,
+               e_test_server_utils_setup,
+               test_get_view_sync,
+               e_test_server_utils_teardown);
        g_test_add (
-               "/EBookClient/DirectAccess/GetBookClientView/Async", ETestServerFixture, &direct_book_closure,
-               e_test_server_utils_setup, test_get_view_async, e_test_server_utils_teardown);
+               "/EBookClient/DirectAccess/GetBookClientView/Async",
+               ETestServerFixture,
+               &direct_book_closure,
+               e_test_server_utils_setup,
+               test_get_view_async,
+               e_test_server_utils_teardown);
 
        return e_test_server_utils_run ();
 }
diff --git a/tests/libebook/client/test-client-modify-contact.c 
b/tests/libebook/client/test-client-modify-contact.c
index 4a9a95b..4d2fc41 100644
--- a/tests/libebook/client/test-client-modify-contact.c
+++ b/tests/libebook/client/test-client-modify-contact.c
@@ -133,13 +133,22 @@ main (gint argc,
        g_type_init ();
 #endif
        g_test_init (&argc, &argv, NULL);
+       g_test_bug_base ("http://bugzilla.gnome.org/";);
 
        g_test_add (
-               "/EBookClient/ModifyContact/Sync", ETestServerFixture, &book_closure,
-               e_test_server_utils_setup, test_modify_contact_sync, e_test_server_utils_teardown);
+               "/EBookClient/ModifyContact/Sync",
+               ETestServerFixture,
+               &book_closure,
+               e_test_server_utils_setup,
+               test_modify_contact_sync,
+               e_test_server_utils_teardown);
        g_test_add (
-               "/EBookClient/ModifyContact/Async", ETestServerFixture, &book_closure,
-               e_test_server_utils_setup, test_modify_contact_async, e_test_server_utils_teardown);
+               "/EBookClient/ModifyContact/Async",
+               ETestServerFixture,
+               &book_closure,
+               e_test_server_utils_setup,
+               test_modify_contact_async,
+               e_test_server_utils_teardown);
 
        return e_test_server_utils_run ();
 }
diff --git a/tests/libebook/client/test-client-photo-is-uri.c 
b/tests/libebook/client/test-client-photo-is-uri.c
index a310b2b..748c1f0 100644
--- a/tests/libebook/client/test-client-photo-is-uri.c
+++ b/tests/libebook/client/test-client-photo-is-uri.c
@@ -335,10 +335,15 @@ main (gint argc,
        g_type_init ();
 #endif
        g_test_init (&argc, &argv, NULL);
+       g_test_bug_base ("http://bugzilla.gnome.org/";);
 
        g_test_add (
-               "/EBookClient/PhotoIsUri", ETestServerFixture, &book_closure,
-               e_test_server_utils_setup, test_photo_is_uri, e_test_server_utils_teardown);
+               "/EBookClient/PhotoIsUri",
+               ETestServerFixture,
+               &book_closure,
+               e_test_server_utils_setup,
+               test_photo_is_uri,
+               e_test_server_utils_teardown);
 
        return e_test_server_utils_run ();
 }
diff --git a/tests/libebook/client/test-client-preserve-uid.c 
b/tests/libebook/client/test-client-preserve-uid.c
index 9b7d4ab..6558b3d 100644
--- a/tests/libebook/client/test-client-preserve-uid.c
+++ b/tests/libebook/client/test-client-preserve-uid.c
@@ -92,13 +92,22 @@ main (gint argc,
        g_type_init ();
 #endif
        g_test_init (&argc, &argv, NULL);
+       g_test_bug_base ("http://bugzilla.gnome.org/";);
 
        g_test_add (
-               "/EBookClient/AddContact/PreserveUid", ETestServerFixture, &book_closure,
-               e_test_server_utils_setup, test_preserve_uid, e_test_server_utils_teardown);
+               "/EBookClient/AddContact/PreserveUid",
+               ETestServerFixture,
+               &book_closure,
+               e_test_server_utils_setup,
+               test_preserve_uid,
+               e_test_server_utils_teardown);
        g_test_add (
-               "/EBookClient/AddContact/UidConflict", ETestServerFixture, &book_closure,
-               e_test_server_utils_setup, test_uid_conflict, e_test_server_utils_teardown);
+               "/EBookClient/AddContact/UidConflict",
+               ETestServerFixture,
+               &book_closure,
+               e_test_server_utils_setup,
+               test_uid_conflict,
+               e_test_server_utils_teardown);
 
        return e_test_server_utils_run ();
 }
diff --git a/tests/libebook/client/test-client-refresh.c b/tests/libebook/client/test-client-refresh.c
index 397ed1f..75a0276 100644
--- a/tests/libebook/client/test-client-refresh.c
+++ b/tests/libebook/client/test-client-refresh.c
@@ -79,13 +79,22 @@ main (gint argc,
        g_type_init ();
 #endif
        g_test_init (&argc, &argv, NULL);
+       g_test_bug_base ("http://bugzilla.gnome.org/";);
 
        g_test_add (
-               "/EBookClient/Refresh/Sync", ETestServerFixture, &book_closure,
-               e_test_server_utils_setup, test_refresh_sync, e_test_server_utils_teardown);
+               "/EBookClient/Refresh/Sync",
+               ETestServerFixture,
+               &book_closure,
+               e_test_server_utils_setup,
+               test_refresh_sync,
+               e_test_server_utils_teardown);
        g_test_add (
-               "/EBookClient/Refresh/Async", ETestServerFixture, &book_closure,
-               e_test_server_utils_setup, test_refresh_async, e_test_server_utils_teardown);
+               "/EBookClient/Refresh/Async",
+               ETestServerFixture,
+               &book_closure,
+               e_test_server_utils_setup,
+               test_refresh_async,
+               e_test_server_utils_teardown);
 
        return e_test_server_utils_run ();
 }
diff --git a/tests/libebook/client/test-client-remove-contact-by-uid.c 
b/tests/libebook/client/test-client-remove-contact-by-uid.c
index 7bfcac4..e2abde8 100644
--- a/tests/libebook/client/test-client-remove-contact-by-uid.c
+++ b/tests/libebook/client/test-client-remove-contact-by-uid.c
@@ -95,13 +95,22 @@ main (gint argc,
        g_type_init ();
 #endif
        g_test_init (&argc, &argv, NULL);
+       g_test_bug_base ("http://bugzilla.gnome.org/";);
 
        g_test_add (
-               "/EBookClient/RemoveContactByUid/Sync", ETestServerFixture, &book_closure,
-               e_test_server_utils_setup, test_remove_contact_by_uid_sync, e_test_server_utils_teardown);
+               "/EBookClient/RemoveContactByUid/Sync",
+               ETestServerFixture,
+               &book_closure,
+               e_test_server_utils_setup,
+               test_remove_contact_by_uid_sync,
+               e_test_server_utils_teardown);
        g_test_add (
-               "/EBookClient/RemoveContactByUid/Async", ETestServerFixture, &book_closure,
-               e_test_server_utils_setup, test_remove_contact_by_uid_async, e_test_server_utils_teardown);
+               "/EBookClient/RemoveContactByUid/Async",
+               ETestServerFixture,
+               &book_closure,
+               e_test_server_utils_setup,
+               test_remove_contact_by_uid_async,
+               e_test_server_utils_teardown);
 
        return e_test_server_utils_run ();
 }
diff --git a/tests/libebook/client/test-client-remove-contact.c 
b/tests/libebook/client/test-client-remove-contact.c
index 0bfb8c8..52ae74a 100644
--- a/tests/libebook/client/test-client-remove-contact.c
+++ b/tests/libebook/client/test-client-remove-contact.c
@@ -116,24 +116,42 @@ main (gint argc,
        g_type_init ();
 #endif
        g_test_init (&argc, &argv, NULL);
+       g_test_bug_base ("http://bugzilla.gnome.org/";);
 
        setlocale (LC_ALL, "en_US.UTF-8");
 
        g_test_add (
-               "/EBookClient/RemoveContact/Sync", ETestServerFixture, &book_closure,
-               e_test_server_utils_setup, test_remove_contact_sync, e_test_server_utils_teardown);
+               "/EBookClient/RemoveContact/Sync",
+               ETestServerFixture,
+               &book_closure,
+               e_test_server_utils_setup,
+               test_remove_contact_sync,
+               e_test_server_utils_teardown);
        g_test_add (
-               "/EBookClient/RemoveContact/Async", ETestServerFixture, &book_closure,
-               e_test_server_utils_setup, test_remove_contact_async, e_test_server_utils_teardown);
-
-       /* We run the direct access variants here because we're interested in testing the error
-        * code from e_book_client_get_contact(removed_contact_uid)  */
+               "/EBookClient/RemoveContact/Async",
+               ETestServerFixture,
+               &book_closure,
+               e_test_server_utils_setup,
+               test_remove_contact_async,
+               e_test_server_utils_teardown);
+
+       /* We run the direct access variants here because
+        * we're interested in testing the error code from
+        * e_book_client_get_contact(removed_contact_uid). */
        g_test_add (
-               "/EBookClient/DirectAccess/RemoveContact/Sync", ETestServerFixture, &direct_book_closure,
-               e_test_server_utils_setup, test_remove_contact_sync, e_test_server_utils_teardown);
+               "/EBookClient/DirectAccess/RemoveContact/Sync",
+               ETestServerFixture,
+               &direct_book_closure,
+               e_test_server_utils_setup,
+               test_remove_contact_sync,
+               e_test_server_utils_teardown);
        g_test_add (
-               "/EBookClient/DirectAccess/RemoveContact/Async", ETestServerFixture, &direct_book_closure,
-               e_test_server_utils_setup, test_remove_contact_async, e_test_server_utils_teardown);
+               "/EBookClient/DirectAccess/RemoveContact/Async",
+               ETestServerFixture,
+               &direct_book_closure,
+               e_test_server_utils_setup,
+               test_remove_contact_async,
+               e_test_server_utils_teardown);
 
        return e_test_server_utils_run ();
 }
diff --git a/tests/libebook/client/test-client-remove-contacts.c 
b/tests/libebook/client/test-client-remove-contacts.c
index 1520fd0..eb1fb16 100644
--- a/tests/libebook/client/test-client-remove-contacts.c
+++ b/tests/libebook/client/test-client-remove-contacts.c
@@ -127,13 +127,22 @@ main (gint argc,
        g_type_init ();
 #endif
        g_test_init (&argc, &argv, NULL);
+       g_test_bug_base ("http://bugzilla.gnome.org/";);
 
        g_test_add (
-               "/EBookClient/RemoveContacts/Sync", ETestServerFixture, &book_closure,
-               e_test_server_utils_setup, test_remove_contacts_sync, e_test_server_utils_teardown);
+               "/EBookClient/RemoveContacts/Sync",
+               ETestServerFixture,
+               &book_closure,
+               e_test_server_utils_setup,
+               test_remove_contacts_sync,
+               e_test_server_utils_teardown);
        g_test_add (
-               "/EBookClient/RemoveContacts/Async", ETestServerFixture, &book_closure,
-               e_test_server_utils_setup, test_remove_contacts_async, e_test_server_utils_teardown);
+               "/EBookClient/RemoveContacts/Async",
+               ETestServerFixture,
+               &book_closure,
+               e_test_server_utils_setup,
+               test_remove_contacts_async,
+               e_test_server_utils_teardown);
 
        return e_test_server_utils_run ();
 }
diff --git a/tests/libebook/client/test-client-revision-view.c 
b/tests/libebook/client/test-client-revision-view.c
index f8f2979..2b271d7 100644
--- a/tests/libebook/client/test-client-revision-view.c
+++ b/tests/libebook/client/test-client-revision-view.c
@@ -217,13 +217,22 @@ main (gint argc,
        g_type_init ();
 #endif
        g_test_init (&argc, &argv, NULL);
+       g_test_bug_base ("http://bugzilla.gnome.org/";);
 
        g_test_add (
-               "/EBookClient/RevisionView/Sync", ETestServerFixture, &book_closure,
-               e_test_server_utils_setup, test_revision_view_sync, e_test_server_utils_teardown);
+               "/EBookClient/RevisionView/Sync",
+               ETestServerFixture,
+               &book_closure,
+               e_test_server_utils_setup,
+               test_revision_view_sync,
+               e_test_server_utils_teardown);
        g_test_add (
-               "/EBookClient/RevisionView/Async", ETestServerFixture, &book_closure,
-               e_test_server_utils_setup, test_revision_view_async, e_test_server_utils_teardown);
+               "/EBookClient/RevisionView/Async",
+               ETestServerFixture,
+               &book_closure,
+               e_test_server_utils_setup,
+               test_revision_view_async,
+               e_test_server_utils_teardown);
 
        return e_test_server_utils_run ();
 }
diff --git a/tests/libebook/client/test-client-self.c b/tests/libebook/client/test-client-self.c
index d6a520f..94544f8 100644
--- a/tests/libebook/client/test-client-self.c
+++ b/tests/libebook/client/test-client-self.c
@@ -10,7 +10,7 @@ static ETestServerClosure registry_closure = { E_TEST_SERVER_NONE, NULL, 0 };
 
 static void
 test_get_self (ETestServerFixture *fixture,
-              gconstpointer user_data)
+               gconstpointer user_data)
 {
        EBookClient *client;
        EContact    *contact;
@@ -31,7 +31,7 @@ test_get_self (ETestServerFixture *fixture,
 
 static void
 test_set_self (ETestServerFixture *fixture,
-              gconstpointer user_data)
+               gconstpointer user_data)
 {
        ESource     *source;
        EBookClient *client;
@@ -42,7 +42,7 @@ test_set_self (ETestServerFixture *fixture,
 
        /* Open the system addressbook */
        source = e_source_registry_ref_builtin_address_book (fixture->registry);
-       client = (EBookClient *)e_book_client_connect_sync (source, NULL, &error);
+       client = (EBookClient *) e_book_client_connect_sync (source, NULL, &error);
        g_object_unref (source);
        if (!client)
                g_error ("Error connecting to system addressbook: %s", error->message);
@@ -84,13 +84,22 @@ main (gint argc,
        g_type_init ();
 #endif
        g_test_init (&argc, &argv, NULL);
+       g_test_bug_base ("http://bugzilla.gnome.org/";);
 
        g_test_add (
-               "/EBookClient/Self/Get", ETestServerFixture, &registry_closure,
-               e_test_server_utils_setup, test_get_self, e_test_server_utils_teardown);
+               "/EBookClient/Self/Get",
+               ETestServerFixture,
+               &registry_closure,
+               e_test_server_utils_setup,
+               test_get_self,
+               e_test_server_utils_teardown);
        g_test_add (
-               "/EBookClient/Self/Set", ETestServerFixture, &registry_closure,
-               e_test_server_utils_setup, test_set_self, e_test_server_utils_teardown);
+               "/EBookClient/Self/Set",
+               ETestServerFixture,
+               &registry_closure,
+               e_test_server_utils_setup,
+               test_set_self,
+               e_test_server_utils_teardown);
 
        return e_test_server_utils_run ();
 }
diff --git a/tests/libebook/client/test-client-suppress-notifications.c 
b/tests/libebook/client/test-client-suppress-notifications.c
index ea86fed..28781e3 100644
--- a/tests/libebook/client/test-client-suppress-notifications.c
+++ b/tests/libebook/client/test-client-suppress-notifications.c
@@ -182,19 +182,36 @@ main (gint argc,
        g_type_init ();
 #endif
        g_test_init (&argc, &argv, NULL);
+       g_test_bug_base ("http://bugzilla.gnome.org/";);
 
        g_test_add (
-               "/EBookClient/SuppressNotifications/Sync", ETestServerFixture, &book_closure,
-               e_test_server_utils_setup, test_suppress_notifications_sync, e_test_server_utils_teardown);
+               "/EBookClient/SuppressNotifications/Sync",
+               ETestServerFixture,
+               &book_closure,
+               e_test_server_utils_setup,
+               test_suppress_notifications_sync,
+               e_test_server_utils_teardown);
        g_test_add (
-               "/EBookClient/SuppressNotifications/Async", ETestServerFixture, &book_closure,
-               e_test_server_utils_setup, test_suppress_notifications_async, e_test_server_utils_teardown);
+               "/EBookClient/SuppressNotifications/Async",
+               ETestServerFixture,
+               &book_closure,
+               e_test_server_utils_setup,
+               test_suppress_notifications_async,
+               e_test_server_utils_teardown);
        g_test_add (
-               "/EBookClient/DirectAccess/SuppressNotifications/Sync", ETestServerFixture, 
&direct_book_closure,
-               e_test_server_utils_setup, test_suppress_notifications_sync, e_test_server_utils_teardown);
+               "/EBookClient/DirectAccess/SuppressNotifications/Sync",
+               ETestServerFixture,
+               &direct_book_closure,
+               e_test_server_utils_setup,
+               test_suppress_notifications_sync,
+               e_test_server_utils_teardown);
        g_test_add (
-               "/EBookClient/DirectAccess/SuppressNotifications/Async", ETestServerFixture, 
&direct_book_closure,
-               e_test_server_utils_setup, test_suppress_notifications_async, e_test_server_utils_teardown);
+               "/EBookClient/DirectAccess/SuppressNotifications/Async",
+               ETestServerFixture,
+               &direct_book_closure,
+               e_test_server_utils_setup,
+               test_suppress_notifications_async,
+               e_test_server_utils_teardown);
 
        return e_test_server_utils_run ();
 }
diff --git a/tests/libebook/client/test-client-uid-only-view.c 
b/tests/libebook/client/test-client-uid-only-view.c
index aab3b4c..099968b 100644
--- a/tests/libebook/client/test-client-uid-only-view.c
+++ b/tests/libebook/client/test-client-uid-only-view.c
@@ -301,20 +301,37 @@ main (gint argc,
        g_type_init ();
 #endif
        g_test_init (&argc, &argv, NULL);
+       g_test_bug_base ("http://bugzilla.gnome.org/";);
 
        g_test_add (
-               "/EBookClient/UidOnlyView/Sync/AllData", ETestServerFixture, &book_closure_all_data,
-               e_test_server_utils_setup, test_get_view_sync, e_test_server_utils_teardown);
+               "/EBookClient/UidOnlyView/Sync/AllData",
+               ETestServerFixture,
+               &book_closure_all_data,
+               e_test_server_utils_setup,
+               test_get_view_sync,
+               e_test_server_utils_teardown);
        g_test_add (
-               "/EBookClient/UidOnlyView/Sync/UidsOnly", ETestServerFixture, &book_closure_uids_only,
-               e_test_server_utils_setup, test_get_view_sync, e_test_server_utils_teardown);
+               "/EBookClient/UidOnlyView/Sync/UidsOnly",
+               ETestServerFixture,
+               &book_closure_uids_only,
+               e_test_server_utils_setup,
+               test_get_view_sync,
+               e_test_server_utils_teardown);
 
        g_test_add (
-               "/EBookClient/UidOnlyView/Async/AllData", ETestServerFixture, &book_closure_all_data,
-               e_test_server_utils_setup, test_get_view_async, e_test_server_utils_teardown);
+               "/EBookClient/UidOnlyView/Async/AllData",
+               ETestServerFixture,
+               &book_closure_all_data,
+               e_test_server_utils_setup,
+               test_get_view_async,
+               e_test_server_utils_teardown);
        g_test_add (
-               "/EBookClient/UidOnlyView/Async/UidsOnly", ETestServerFixture, &book_closure_uids_only,
-               e_test_server_utils_setup, test_get_view_async, e_test_server_utils_teardown);
+               "/EBookClient/UidOnlyView/Async/UidsOnly",
+               ETestServerFixture,
+               &book_closure_uids_only,
+               e_test_server_utils_setup,
+               test_get_view_async,
+               e_test_server_utils_teardown);
 
        return e_test_server_utils_run ();
 }
diff --git a/tests/libebook/client/test-client-view-operations.c 
b/tests/libebook/client/test-client-view-operations.c
index 56cfbd4..54699d5 100644
--- a/tests/libebook/client/test-client-view-operations.c
+++ b/tests/libebook/client/test-client-view-operations.c
@@ -105,10 +105,10 @@ finish_thread_test (ThreadData *data)
  ************************************/
 static void
 view_ready (GObject *source_object,
-           GAsyncResult *res,
-           gpointer user_data)
+            GAsyncResult *res,
+            gpointer user_data)
 {
-       ThreadData *data = (ThreadData *)user_data;
+       ThreadData *data = (ThreadData *) user_data;
        GError *error = NULL;
 
        if (!e_book_client_get_view_finish (E_BOOK_CLIENT (source_object), res, &(data->view), &error))
@@ -145,13 +145,13 @@ start_thread_test_async (ThreadData *data)
 
 static void
 connect_ready (GObject *source_object,
-              GAsyncResult *res,
-              gpointer user_data)
+               GAsyncResult *res,
+               gpointer user_data)
 {
-       ThreadData *data = (ThreadData *)user_data;
+       ThreadData *data = (ThreadData *) user_data;
        GError     *error = NULL;
 
-       data->client = (EBookClient *)e_book_client_connect_finish (res, &error);
+       data->client = (EBookClient *) e_book_client_connect_finish (res, &error);
        if (!data->client)
                g_error ("Error asynchronously connecting to client");
 
@@ -289,7 +289,7 @@ test_view_thread_sync (ThreadData *data)
 static ThreadData *
 create_test_thread (const gchar *book_uid,
                     gconstpointer user_data,
-                   gboolean sync)
+                    gboolean sync)
 {
        ThreadData  *data = g_slice_new0 (ThreadData);
 
@@ -310,7 +310,7 @@ create_test_thread (const gchar *book_uid,
 static void
 test_concurrent_views (ETestServerFixture *fixture,
                        gconstpointer user_data,
-                      gboolean sync)
+                       gboolean sync)
 {
        EBookClient *main_client;
        ESource *source;
@@ -357,19 +357,18 @@ test_concurrent_views (ETestServerFixture *fixture,
 
 static void
 test_concurrent_views_sync (ETestServerFixture *fixture,
-                           gconstpointer user_data)
+                            gconstpointer user_data)
 {
        test_concurrent_views (fixture, user_data, TRUE);
 }
 
 static void
 test_concurrent_views_async (ETestServerFixture *fixture,
-                            gconstpointer user_data)
+                             gconstpointer user_data)
 {
        test_concurrent_views (fixture, user_data, FALSE);
 }
 
-
 gint
 main (gint argc,
       gchar **argv)
@@ -378,20 +377,38 @@ main (gint argc,
        g_type_init ();
 #endif
        g_test_init (&argc, &argv, NULL);
+       g_test_bug_base ("http://bugzilla.gnome.org/";);
+
        setlocale (LC_ALL, "en_US.UTF-8");
 
        g_test_add (
-               "/EBookClient/ConcurrentViews/Sync", ETestServerFixture, &book_closure,
-               e_test_server_utils_setup, test_concurrent_views_sync, e_test_server_utils_teardown);
+               "/EBookClient/ConcurrentViews/Sync",
+               ETestServerFixture,
+               &book_closure,
+               e_test_server_utils_setup,
+               test_concurrent_views_sync,
+               e_test_server_utils_teardown);
        g_test_add (
-               "/EBookClient/ConcurrentViews/Async", ETestServerFixture, &book_closure,
-               e_test_server_utils_setup, test_concurrent_views_async, e_test_server_utils_teardown);
+               "/EBookClient/ConcurrentViews/Async",
+               ETestServerFixture,
+               &book_closure,
+               e_test_server_utils_setup,
+               test_concurrent_views_async,
+               e_test_server_utils_teardown);
        g_test_add (
-               "/EBookClient/DirectAccess/ConcurrentViews/Sync", ETestServerFixture, &direct_book_closure,
-               e_test_server_utils_setup, test_concurrent_views_sync, e_test_server_utils_teardown);
+               "/EBookClient/DirectAccess/ConcurrentViews/Sync",
+               ETestServerFixture,
+               &direct_book_closure,
+               e_test_server_utils_setup,
+               test_concurrent_views_sync,
+               e_test_server_utils_teardown);
        g_test_add (
-               "/EBookClient/DirectAccess/ConcurrentViews/Async", ETestServerFixture, &direct_book_closure,
-               e_test_server_utils_setup, test_concurrent_views_async, e_test_server_utils_teardown);
+               "/EBookClient/DirectAccess/ConcurrentViews/Async",
+               ETestServerFixture,
+               &direct_book_closure,
+               e_test_server_utils_setup,
+               test_concurrent_views_async,
+               e_test_server_utils_teardown);
 
        return e_test_server_utils_run ();
 }
diff --git a/tests/libebook/client/test-client-write-write.c b/tests/libebook/client/test-client-write-write.c
index 22dd263..4425302 100644
--- a/tests/libebook/client/test-client-write-write.c
+++ b/tests/libebook/client/test-client-write-write.c
@@ -324,11 +324,17 @@ main (gint argc,
        g_type_init ();
 #endif
        g_test_init (&argc, &argv, NULL);
+       g_test_bug_base ("http://bugzilla.gnome.org/";);
+
        setlocale (LC_ALL, "en_US.UTF-8");
 
        g_test_add (
-               "/EBookClient/ConcurrentWrites", ETestServerFixture, &book_closure,
-               e_test_server_utils_setup, test_concurrent_writes, e_test_server_utils_teardown);
+               "/EBookClient/ConcurrentWrites",
+               ETestServerFixture,
+               &book_closure,
+               e_test_server_utils_setup,
+               test_concurrent_writes,
+               e_test_server_utils_teardown);
 
        return e_test_server_utils_run ();
 }
diff --git a/tests/libebook/test-ebook-add-contact.c b/tests/libebook/test-ebook-add-contact.c
index f2bb534..236898d 100644
--- a/tests/libebook/test-ebook-add-contact.c
+++ b/tests/libebook/test-ebook-add-contact.c
@@ -52,13 +52,22 @@ main (gint argc,
        g_type_init ();
 #endif
        g_test_init (&argc, &argv, NULL);
+       g_test_bug_base ("http://bugzilla.gnome.org/";);
 
        g_test_add (
-               "/EBook/AddContact/Sync", ETestServerFixture, &book_closure,
-               e_test_server_utils_setup, test_add_contact_sync, e_test_server_utils_teardown);
+               "/EBook/AddContact/Sync",
+               ETestServerFixture,
+               &book_closure,
+               e_test_server_utils_setup,
+               test_add_contact_sync,
+               e_test_server_utils_teardown);
        g_test_add (
-               "/EBook/AddContact/Async", ETestServerFixture, &book_closure,
-               e_test_server_utils_setup, test_add_contact_async, e_test_server_utils_teardown);
+               "/EBook/AddContact/Async",
+               ETestServerFixture,
+               &book_closure,
+               e_test_server_utils_setup,
+               test_add_contact_async,
+               e_test_server_utils_teardown);
 
        return e_test_server_utils_run ();
 }
diff --git a/tests/libebook/test-ebook-commit-contact.c b/tests/libebook/test-ebook-commit-contact.c
index 83aadaa..5f05a01 100644
--- a/tests/libebook/test-ebook-commit-contact.c
+++ b/tests/libebook/test-ebook-commit-contact.c
@@ -102,13 +102,22 @@ main (gint argc,
        g_type_init ();
 #endif
        g_test_init (&argc, &argv, NULL);
+       g_test_bug_base ("http://bugzilla.gnome.org/";);
 
        g_test_add (
-               "/EBook/CommitContact/Sync", ETestServerFixture, &book_closure,
-               e_test_server_utils_setup, test_commit_contact_sync, e_test_server_utils_teardown);
+               "/EBook/CommitContact/Sync",
+               ETestServerFixture,
+               &book_closure,
+               e_test_server_utils_setup,
+               test_commit_contact_sync,
+               e_test_server_utils_teardown);
        g_test_add (
-               "/EBook/CommitContact/Async", ETestServerFixture, &book_closure,
-               e_test_server_utils_setup, test_commit_contact_async, e_test_server_utils_teardown);
+               "/EBook/CommitContact/Async",
+               ETestServerFixture,
+               &book_closure,
+               e_test_server_utils_setup,
+               test_commit_contact_async,
+               e_test_server_utils_teardown);
 
        return e_test_server_utils_run ();
 }
diff --git a/tests/libebook/test-ebook-get-book-view.c b/tests/libebook/test-ebook-get-book-view.c
index 0fb728b..a4961d5 100644
--- a/tests/libebook/test-ebook-get-book-view.c
+++ b/tests/libebook/test-ebook-get-book-view.c
@@ -147,13 +147,22 @@ main (gint argc,
        g_type_init ();
 #endif
        g_test_init (&argc, &argv, NULL);
+       g_test_bug_base ("http://bugzilla.gnome.org/";);
 
        g_test_add (
-               "/EBook/GetBookView/Sync", ETestServerFixture, &book_closure,
-               e_test_server_utils_setup, test_get_book_view_sync, e_test_server_utils_teardown);
+               "/EBook/GetBookView/Sync",
+               ETestServerFixture,
+               &book_closure,
+               e_test_server_utils_setup,
+               test_get_book_view_sync,
+               e_test_server_utils_teardown);
        g_test_add (
-               "/EBook/GetBookView/Async", ETestServerFixture, &book_closure,
-               e_test_server_utils_setup, test_get_book_view_async, e_test_server_utils_teardown);
+               "/EBook/GetBookView/Async",
+               ETestServerFixture,
+               &book_closure,
+               e_test_server_utils_setup,
+               test_get_book_view_async,
+               e_test_server_utils_teardown);
 
        return e_test_server_utils_run ();
 }
diff --git a/tests/libebook/test-ebook-get-contact.c b/tests/libebook/test-ebook-get-contact.c
index 5f19d37..ce6c407 100644
--- a/tests/libebook/test-ebook-get-contact.c
+++ b/tests/libebook/test-ebook-get-contact.c
@@ -50,13 +50,22 @@ main (gint argc,
        g_type_init ();
 #endif
        g_test_init (&argc, &argv, NULL);
+       g_test_bug_base ("http://bugzilla.gnome.org/";);
 
        g_test_add (
-               "/EBook/GetContact/Sync", ETestServerFixture, &book_closure,
-               e_test_server_utils_setup, test_get_contact_sync, e_test_server_utils_teardown);
+               "/EBook/GetContact/Sync",
+               ETestServerFixture,
+               &book_closure,
+               e_test_server_utils_setup,
+               test_get_contact_sync,
+               e_test_server_utils_teardown);
        g_test_add (
-               "/EBook/GetContact/Async", ETestServerFixture, &book_closure,
-               e_test_server_utils_setup, test_get_contact_async, e_test_server_utils_teardown);
+               "/EBook/GetContact/Async",
+               ETestServerFixture,
+               &book_closure,
+               e_test_server_utils_setup,
+               test_get_contact_async,
+               e_test_server_utils_teardown);
 
        return e_test_server_utils_run ();
 }
diff --git a/tests/libebook/test-ebook-get-required-fields.c b/tests/libebook/test-ebook-get-required-fields.c
index a6abf77..467258f 100644
--- a/tests/libebook/test-ebook-get-required-fields.c
+++ b/tests/libebook/test-ebook-get-required-fields.c
@@ -76,13 +76,22 @@ main (gint argc,
        g_type_init ();
 #endif
        g_test_init (&argc, &argv, NULL);
+       g_test_bug_base ("http://bugzilla.gnome.org/";);
 
        g_test_add (
-               "/EBook/GetRequiredFields/Sync", ETestServerFixture, &book_closure,
-               e_test_server_utils_setup, test_get_required_fields_sync, e_test_server_utils_teardown);
+               "/EBook/GetRequiredFields/Sync",
+               ETestServerFixture,
+               &book_closure,
+               e_test_server_utils_setup,
+               test_get_required_fields_sync,
+               e_test_server_utils_teardown);
        g_test_add (
-               "/EBook/GetRequiredFields/Async", ETestServerFixture, &book_closure,
-               e_test_server_utils_setup, test_get_required_fields_async, e_test_server_utils_teardown);
+               "/EBook/GetRequiredFields/Async",
+               ETestServerFixture,
+               &book_closure,
+               e_test_server_utils_setup,
+               test_get_required_fields_async,
+               e_test_server_utils_teardown);
 
        return e_test_server_utils_run ();
 }
diff --git a/tests/libebook/test-ebook-get-static-capabilities.c 
b/tests/libebook/test-ebook-get-static-capabilities.c
index 0c6ca1e..ac6dcc3 100644
--- a/tests/libebook/test-ebook-get-static-capabilities.c
+++ b/tests/libebook/test-ebook-get-static-capabilities.c
@@ -30,10 +30,15 @@ main (gint argc,
        g_type_init ();
 #endif
        g_test_init (&argc, &argv, NULL);
+       g_test_bug_base ("http://bugzilla.gnome.org/";);
 
        g_test_add (
-               "/EBook/GetStaticCapabilities/Sync", ETestServerFixture, &book_closure,
-               e_test_server_utils_setup, test_get_static_capabilities_sync, e_test_server_utils_teardown);
+               "/EBook/GetStaticCapabilities/Sync",
+               ETestServerFixture,
+               &book_closure,
+               e_test_server_utils_setup,
+               test_get_static_capabilities_sync,
+               e_test_server_utils_teardown);
 
        return e_test_server_utils_run ();
 }
diff --git a/tests/libebook/test-ebook-get-supported-auth-methods.c 
b/tests/libebook/test-ebook-get-supported-auth-methods.c
index 0447164..9f7ec30 100644
--- a/tests/libebook/test-ebook-get-supported-auth-methods.c
+++ b/tests/libebook/test-ebook-get-supported-auth-methods.c
@@ -100,13 +100,22 @@ main (gint argc,
        g_type_init ();
 #endif
        g_test_init (&argc, &argv, NULL);
+       g_test_bug_base ("http://bugzilla.gnome.org/";);
 
        g_test_add (
-               "/EBook/GetSupportedAuthMethods/Sync", ETestServerFixture, &book_closure,
-               e_test_server_utils_setup, test_get_supported_auth_methods_sync, 
e_test_server_utils_teardown);
+               "/EBook/GetSupportedAuthMethods/Sync",
+               ETestServerFixture,
+               &book_closure,
+               e_test_server_utils_setup,
+               test_get_supported_auth_methods_sync,
+               e_test_server_utils_teardown);
        g_test_add (
-               "/EBook/GetSupportedAuthMethods/Async", ETestServerFixture, &book_closure,
-               e_test_server_utils_setup, test_get_supported_auth_methods_async, 
e_test_server_utils_teardown);
+               "/EBook/GetSupportedAuthMethods/Async",
+               ETestServerFixture,
+               &book_closure,
+               e_test_server_utils_setup,
+               test_get_supported_auth_methods_async,
+               e_test_server_utils_teardown);
 
        return e_test_server_utils_run ();
 }
diff --git a/tests/libebook/test-ebook-get-supported-fields.c 
b/tests/libebook/test-ebook-get-supported-fields.c
index 5c2e042..771abdb 100644
--- a/tests/libebook/test-ebook-get-supported-fields.c
+++ b/tests/libebook/test-ebook-get-supported-fields.c
@@ -78,13 +78,22 @@ main (gint argc,
        g_type_init ();
 #endif
        g_test_init (&argc, &argv, NULL);
+       g_test_bug_base ("http://bugzilla.gnome.org/";);
 
        g_test_add (
-               "/EBook/GetSupportedFields/Sync", ETestServerFixture, &book_closure,
-               e_test_server_utils_setup, test_get_supported_fields_sync, e_test_server_utils_teardown);
+               "/EBook/GetSupportedFields/Sync",
+               ETestServerFixture,
+               &book_closure,
+               e_test_server_utils_setup,
+               test_get_supported_fields_sync,
+               e_test_server_utils_teardown);
        g_test_add (
-               "/EBook/GetSupportedFields/Async", ETestServerFixture, &book_closure,
-               e_test_server_utils_setup, test_get_supported_fields_async, e_test_server_utils_teardown);
+               "/EBook/GetSupportedFields/Async",
+               ETestServerFixture,
+               &book_closure,
+               e_test_server_utils_setup,
+               test_get_supported_fields_async,
+               e_test_server_utils_teardown);
 
        return e_test_server_utils_run ();
 }
diff --git a/tests/libebook/test-ebook-remove-contact-by-id.c 
b/tests/libebook/test-ebook-remove-contact-by-id.c
index a0091f9..dd672a6 100644
--- a/tests/libebook/test-ebook-remove-contact-by-id.c
+++ b/tests/libebook/test-ebook-remove-contact-by-id.c
@@ -33,10 +33,15 @@ main (gint argc,
        g_type_init ();
 #endif
        g_test_init (&argc, &argv, NULL);
+       g_test_bug_base ("http://bugzilla.gnome.org/";);
 
        g_test_add (
-               "/EBook/RemoveContactById/Async", ETestServerFixture, &book_closure,
-               e_test_server_utils_setup, test_remove_contact_by_id_async, e_test_server_utils_teardown);
+               "/EBook/RemoveContactById/Async",
+               ETestServerFixture,
+               &book_closure,
+               e_test_server_utils_setup,
+               test_remove_contact_by_id_async,
+               e_test_server_utils_teardown);
 
        return e_test_server_utils_run ();
 }
diff --git a/tests/libebook/test-ebook-remove-contact.c b/tests/libebook/test-ebook-remove-contact.c
index 566b9df..c3aa8f5 100644
--- a/tests/libebook/test-ebook-remove-contact.c
+++ b/tests/libebook/test-ebook-remove-contact.c
@@ -58,13 +58,22 @@ main (gint argc,
        g_type_init ();
 #endif
        g_test_init (&argc, &argv, NULL);
+       g_test_bug_base ("http://bugzilla.gnome.org/";);
 
        g_test_add (
-               "/EBook/RemoveContact/Sync", ETestServerFixture, &book_closure,
-               e_test_server_utils_setup, test_remove_contact_sync, e_test_server_utils_teardown);
+               "/EBook/RemoveContact/Sync",
+               ETestServerFixture,
+               &book_closure,
+               e_test_server_utils_setup,
+               test_remove_contact_sync,
+               e_test_server_utils_teardown);
        g_test_add (
-               "/EBook/RemoveContact/Async", ETestServerFixture, &book_closure,
-               e_test_server_utils_setup, test_remove_contact_async, e_test_server_utils_teardown);
+               "/EBook/RemoveContact/Async",
+               ETestServerFixture,
+               &book_closure,
+               e_test_server_utils_setup,
+               test_remove_contact_async,
+               e_test_server_utils_teardown);
 
        return e_test_server_utils_run ();
 }
diff --git a/tests/libebook/test-ebook-remove-contacts.c b/tests/libebook/test-ebook-remove-contacts.c
index fb35bb8..8a2842b 100644
--- a/tests/libebook/test-ebook-remove-contacts.c
+++ b/tests/libebook/test-ebook-remove-contacts.c
@@ -74,13 +74,22 @@ main (gint argc,
        g_type_init ();
 #endif
        g_test_init (&argc, &argv, NULL);
+       g_test_bug_base ("http://bugzilla.gnome.org/";);
 
        g_test_add (
-               "/EBook/RemoveContacts/Sync", ETestServerFixture, &book_closure,
-               e_test_server_utils_setup, test_remove_contacts_sync, e_test_server_utils_teardown);
+               "/EBook/RemoveContacts/Sync",
+               ETestServerFixture,
+               &book_closure,
+               e_test_server_utils_setup,
+               test_remove_contacts_sync,
+               e_test_server_utils_teardown);
        g_test_add (
-               "/EBook/RemoveContacts/Async", ETestServerFixture, &book_closure,
-               e_test_server_utils_setup, test_remove_contacts_async, e_test_server_utils_teardown);
+               "/EBook/RemoveContacts/Async",
+               ETestServerFixture,
+               &book_closure,
+               e_test_server_utils_setup,
+               test_remove_contacts_async,
+               e_test_server_utils_teardown);
 
        return e_test_server_utils_run ();
 }
diff --git a/tests/libecal/client/test-client-add-timezone.c b/tests/libecal/client/test-client-add-timezone.c
index afce41d..8ef5a65 100644
--- a/tests/libecal/client/test-client-add-timezone.c
+++ b/tests/libecal/client/test-client-add-timezone.c
@@ -132,13 +132,22 @@ main (gint argc,
        g_type_init ();
 #endif
        g_test_init (&argc, &argv, NULL);
+       g_test_bug_base ("http://bugzilla.gnome.org/";);
 
        g_test_add (
-               "/ECalClient/AddTimezone/Sync", ETestServerFixture, &cal_closure,
-               e_test_server_utils_setup, test_add_timezone_sync, e_test_server_utils_teardown);
+               "/ECalClient/AddTimezone/Sync",
+               ETestServerFixture,
+               &cal_closure,
+               e_test_server_utils_setup,
+               test_add_timezone_sync,
+               e_test_server_utils_teardown);
        g_test_add (
-               "/ECalClient/AddTimezone/Async", ETestServerFixture, &cal_closure,
-               e_test_server_utils_setup, test_add_timezone_async, e_test_server_utils_teardown);
+               "/ECalClient/AddTimezone/Async",
+               ETestServerFixture,
+               &cal_closure,
+               e_test_server_utils_setup,
+               test_add_timezone_async,
+               e_test_server_utils_teardown);
 
        return e_test_server_utils_run ();
 }
diff --git a/tests/libecal/client/test-client-bulk-methods.c b/tests/libecal/client/test-client-bulk-methods.c
index 32a369b..9f2d3c8 100644
--- a/tests/libecal/client/test-client-bulk-methods.c
+++ b/tests/libecal/client/test-client-bulk-methods.c
@@ -203,10 +203,15 @@ main (gint argc,
        g_type_init ();
 #endif
        g_test_init (&argc, &argv, NULL);
+       g_test_bug_base ("http://bugzilla.gnome.org/";);
 
        g_test_add (
-               "/ECalClient/BulkMethods", ETestServerFixture, &cal_closure,
-               e_test_server_utils_setup, run_test_bulk_methods, e_test_server_utils_teardown);
+               "/ECalClient/BulkMethods",
+               ETestServerFixture,
+               &cal_closure,
+               e_test_server_utils_setup,
+               run_test_bulk_methods,
+               e_test_server_utils_teardown);
 
        return e_test_server_utils_run ();
 }
diff --git a/tests/libecal/client/test-client-create-object.c 
b/tests/libecal/client/test-client-create-object.c
index 25e24c0..c8d1a8c 100644
--- a/tests/libecal/client/test-client-create-object.c
+++ b/tests/libecal/client/test-client-create-object.c
@@ -210,13 +210,22 @@ main (gint argc,
        g_type_init ();
 #endif
        g_test_init (&argc, &argv, NULL);
+       g_test_bug_base ("http://bugzilla.gnome.org/";);
 
        g_test_add (
-               "/ECalClient/CreateObject/Sync", ETestServerFixture, &cal_closure,
-               e_test_server_utils_setup, test_create_object_sync, e_test_server_utils_teardown);
+               "/ECalClient/CreateObject/Sync",
+               ETestServerFixture,
+               &cal_closure,
+               e_test_server_utils_setup,
+               test_create_object_sync,
+               e_test_server_utils_teardown);
        g_test_add (
-               "/ECalClient/CreateObject/Async", ETestServerFixture, &cal_closure,
-               e_test_server_utils_setup, test_create_object_async, e_test_server_utils_teardown);
+               "/ECalClient/CreateObject/Async",
+               ETestServerFixture,
+               &cal_closure,
+               e_test_server_utils_setup,
+               test_create_object_async,
+               e_test_server_utils_teardown);
 
        return e_test_server_utils_run ();
 }
diff --git a/tests/libecal/client/test-client-get-attachment-uris.c 
b/tests/libecal/client/test-client-get-attachment-uris.c
index 327389e..78c32f0 100644
--- a/tests/libecal/client/test-client-get-attachment-uris.c
+++ b/tests/libecal/client/test-client-get-attachment-uris.c
@@ -147,13 +147,22 @@ main (gint argc,
        g_type_init ();
 #endif
        g_test_init (&argc, &argv, NULL);
+       g_test_bug_base ("http://bugzilla.gnome.org/";);
 
        g_test_add (
-               "/ECalClient/GetAttachmentUris/Sync", ETestServerFixture, &cal_closure,
-               e_test_server_utils_setup, test_get_attachment_uris_sync, e_test_server_utils_teardown);
+               "/ECalClient/GetAttachmentUris/Sync",
+               ETestServerFixture,
+               &cal_closure,
+               e_test_server_utils_setup,
+               test_get_attachment_uris_sync,
+               e_test_server_utils_teardown);
        g_test_add (
-               "/ECalClient/GetAttachmentUris/Async", ETestServerFixture, &cal_closure,
-               e_test_server_utils_setup, test_get_attachment_uris_async, e_test_server_utils_teardown);
+               "/ECalClient/GetAttachmentUris/Async",
+               ETestServerFixture,
+               &cal_closure,
+               e_test_server_utils_setup,
+               test_get_attachment_uris_async,
+               e_test_server_utils_teardown);
 
        return e_test_server_utils_run ();
 }
diff --git a/tests/libecal/client/test-client-get-free-busy.c 
b/tests/libecal/client/test-client-get-free-busy.c
index 9663b07..c24df2d 100644
--- a/tests/libecal/client/test-client-get-free-busy.c
+++ b/tests/libecal/client/test-client-get-free-busy.c
@@ -176,13 +176,22 @@ main (gint argc,
        g_type_init ();
 #endif
        g_test_init (&argc, &argv, NULL);
+       g_test_bug_base ("http://bugzilla.gnome.org/";);
 
        g_test_add (
-               "/ECalClient/GetFreeBusy/Sync", ETestServerFixture, &cal_closure,
-               setup_fixture, test_get_free_busy_sync, teardown_fixture);
+               "/ECalClient/GetFreeBusy/Sync",
+               ETestServerFixture,
+               &cal_closure,
+               setup_fixture,
+               test_get_free_busy_sync,
+               teardown_fixture);
        g_test_add (
-               "/ECalClient/GetFreeBusy/Async", ETestServerFixture, &cal_closure,
-               setup_fixture, test_get_free_busy_async, teardown_fixture);
+               "/ECalClient/GetFreeBusy/Async",
+               ETestServerFixture,
+               &cal_closure,
+               setup_fixture,
+               test_get_free_busy_async,
+               teardown_fixture);
 
        return e_test_server_utils_run ();
 }
diff --git a/tests/libecal/client/test-client-get-object-list.c 
b/tests/libecal/client/test-client-get-object-list.c
index 81a60cf..04ac694 100644
--- a/tests/libecal/client/test-client-get-object-list.c
+++ b/tests/libecal/client/test-client-get-object-list.c
@@ -134,13 +134,22 @@ main (gint argc,
        g_type_init ();
 #endif
        g_test_init (&argc, &argv, NULL);
+       g_test_bug_base ("http://bugzilla.gnome.org/";);
 
        g_test_add (
-               "/ECalClient/GetObjectList/Sync", ETestServerFixture, &cal_closure,
-               e_test_server_utils_setup, test_get_object_list_sync, e_test_server_utils_teardown);
+               "/ECalClient/GetObjectList/Sync",
+               ETestServerFixture,
+               &cal_closure,
+               e_test_server_utils_setup,
+               test_get_object_list_sync,
+               e_test_server_utils_teardown);
        g_test_add (
-               "/ECalClient/GetObjectList/Async", ETestServerFixture, &cal_closure,
-               e_test_server_utils_setup, test_get_object_list_async, e_test_server_utils_teardown);
+               "/ECalClient/GetObjectList/Async",
+               ETestServerFixture,
+               &cal_closure,
+               e_test_server_utils_setup,
+               test_get_object_list_async,
+               e_test_server_utils_teardown);
 
        return e_test_server_utils_run ();
 }
diff --git a/tests/libecal/client/test-client-get-revision.c b/tests/libecal/client/test-client-get-revision.c
index 65861b2..3087368 100644
--- a/tests/libecal/client/test-client-get-revision.c
+++ b/tests/libecal/client/test-client-get-revision.c
@@ -14,41 +14,42 @@ static ETestServerClosure cal_closure =
 static void
 get_revision_compare_cycle (ECalClient *client)
 {
-       icalcomponent *icalcomp;
-       struct icaltimetype now;
-       gchar    *revision_before = NULL, *revision_after = NULL, *uid = NULL;
-       GError   *error = NULL;
-
-       /* Build up new component */
-       now = icaltime_current_time_with_zone (icaltimezone_get_utc_timezone ());
-       icalcomp = icalcomponent_new (ICAL_VEVENT_COMPONENT);
-       icalcomponent_set_summary (icalcomp, "Test event summary");
-       icalcomponent_set_dtstart (icalcomp, now);
-       icalcomponent_set_dtend   (icalcomp, icaltime_from_timet (icaltime_as_timet (now) + 60 * 60 * 60, 0));
-
-       if (!e_client_get_backend_property_sync (E_CLIENT (client), CLIENT_BACKEND_PROPERTY_REVISION,
+       icalcomponent *icalcomp;
+       struct icaltimetype now;
+       gchar    *revision_before = NULL, *revision_after = NULL, *uid = NULL;
+       GError   *error = NULL;
+
+       /* Build up new component */
+       now = icaltime_current_time_with_zone (icaltimezone_get_utc_timezone ());
+       icalcomp = icalcomponent_new (ICAL_VEVENT_COMPONENT);
+       icalcomponent_set_summary (icalcomp, "Test event summary");
+       icalcomponent_set_dtstart (icalcomp, now);
+       icalcomponent_set_dtend   (icalcomp, icaltime_from_timet (icaltime_as_timet (now) + 60 * 60 * 60, 0));
+
+       if (!e_client_get_backend_property_sync (E_CLIENT (client), CLIENT_BACKEND_PROPERTY_REVISION,
                                                &revision_before, NULL, &error))
-              g_error ("Error getting book revision: %s", error->message);
+               g_error ("Error getting book revision: %s", error->message);
 
-       if (!e_cal_client_create_object_sync (client, icalcomp, &uid, NULL, &error))
-              g_error ("Error creating object: %s", error->message);
+       if (!e_cal_client_create_object_sync (client, icalcomp, &uid, NULL, &error))
+               g_error ("Error creating object: %s", error->message);
 
-       if (!e_client_get_backend_property_sync (E_CLIENT (client), CLIENT_BACKEND_PROPERTY_REVISION,
+       if (!e_client_get_backend_property_sync (E_CLIENT (client), CLIENT_BACKEND_PROPERTY_REVISION,
                                                &revision_after, NULL, &error))
-              g_error ("Error getting book revision: %s", error->message);
+               g_error ("Error getting book revision: %s", error->message);
 
-       g_assert (revision_before);
-       g_assert (revision_after);
-       g_assert (strcmp (revision_before, revision_after) != 0);
+       g_assert (revision_before);
+       g_assert (revision_after);
+       g_assert (strcmp (revision_before, revision_after) != 0);
 
-       g_message ("Passed cycle, revision before '%s' revision after '%s'",
-                 revision_before, revision_after);
+       g_message (
+               "Passed cycle, revision before '%s' revision after '%s'",
+               revision_before, revision_after);
 
-       g_free (revision_before);
-       g_free (revision_after);
-       g_free (uid);
+       g_free (revision_before);
+       g_free (revision_after);
+       g_free (uid);
 
-       icalcomponent_free (icalcomp);
+       icalcomponent_free (icalcomp);
 }
 
 static void
@@ -73,10 +74,15 @@ main (gint argc,
        g_type_init ();
 #endif
        g_test_init (&argc, &argv, NULL);
+       g_test_bug_base ("http://bugzilla.gnome.org/";);
 
        g_test_add (
-               "/ECalClient/GetRevision", ETestServerFixture, &cal_closure,
-               e_test_server_utils_setup, test_get_revision, e_test_server_utils_teardown);
+               "/ECalClient/GetRevision",
+               ETestServerFixture,
+               &cal_closure,
+               e_test_server_utils_setup,
+               test_get_revision,
+               e_test_server_utils_teardown);
 
        return e_test_server_utils_run ();
 }
diff --git a/tests/libecal/client/test-client-get-view.c b/tests/libecal/client/test-client-get-view.c
index 03aa93c..6ef0118 100644
--- a/tests/libecal/client/test-client-get-view.c
+++ b/tests/libecal/client/test-client-get-view.c
@@ -211,13 +211,22 @@ main (gint argc,
        g_type_init ();
 #endif
        g_test_init (&argc, &argv, NULL);
+       g_test_bug_base ("http://bugzilla.gnome.org/";);
 
        g_test_add (
-               "/ECalClient/GetView/Sync", ETestServerFixture, &cal_closure,
-               e_test_server_utils_setup, test_get_view_sync, e_test_server_utils_teardown);
+               "/ECalClient/GetView/Sync",
+               ETestServerFixture,
+               &cal_closure,
+               e_test_server_utils_setup,
+               test_get_view_sync,
+               e_test_server_utils_teardown);
        g_test_add (
-               "/ECalClient/GetView/Async", ETestServerFixture, &cal_closure,
-               e_test_server_utils_setup, test_get_view_async, e_test_server_utils_teardown);
+               "/ECalClient/GetView/Async",
+               ETestServerFixture,
+               &cal_closure,
+               e_test_server_utils_setup,
+               test_get_view_async,
+               e_test_server_utils_teardown);
 
        return e_test_server_utils_run ();
 }
diff --git a/tests/libecal/client/test-client-modify-object.c 
b/tests/libecal/client/test-client-modify-object.c
index 97f774e..7da3dcd 100644
--- a/tests/libecal/client/test-client-modify-object.c
+++ b/tests/libecal/client/test-client-modify-object.c
@@ -131,13 +131,22 @@ main (gint argc,
        g_type_init ();
 #endif
        g_test_init (&argc, &argv, NULL);
+       g_test_bug_base ("http://bugzilla.gnome.org/";);
 
        g_test_add (
-               "/ECalClient/ModifyObject/Sync", ETestServerFixture, &cal_closure,
-               e_test_server_utils_setup, test_modify_object_sync, e_test_server_utils_teardown);
+               "/ECalClient/ModifyObject/Sync",
+               ETestServerFixture,
+               &cal_closure,
+               e_test_server_utils_setup,
+               test_modify_object_sync,
+               e_test_server_utils_teardown);
        g_test_add (
-               "/ECalClient/ModifyObject/Async", ETestServerFixture, &cal_closure,
-               e_test_server_utils_setup, test_modify_object_async, e_test_server_utils_teardown);
+               "/ECalClient/ModifyObject/Async",
+               ETestServerFixture,
+               &cal_closure,
+               e_test_server_utils_setup,
+               test_modify_object_async,
+               e_test_server_utils_teardown);
 
        return e_test_server_utils_run ();
 }
diff --git a/tests/libecal/client/test-client-receive-objects.c 
b/tests/libecal/client/test-client-receive-objects.c
index bb40c1b..aaaa789 100644
--- a/tests/libecal/client/test-client-receive-objects.c
+++ b/tests/libecal/client/test-client-receive-objects.c
@@ -86,13 +86,22 @@ main (gint argc,
        g_type_init ();
 #endif
        g_test_init (&argc, &argv, NULL);
+       g_test_bug_base ("http://bugzilla.gnome.org/";);
 
        g_test_add (
-               "/ECalClient/ReceiveObjects/Sync", ETestServerFixture, &cal_closure,
-               e_test_server_utils_setup, test_receive_objects_sync, e_test_server_utils_teardown);
+               "/ECalClient/ReceiveObjects/Sync",
+               ETestServerFixture,
+               &cal_closure,
+               e_test_server_utils_setup,
+               test_receive_objects_sync,
+               e_test_server_utils_teardown);
        g_test_add (
-               "/ECalClient/ReceiveObjects/Async", ETestServerFixture, &cal_closure,
-               e_test_server_utils_setup, test_receive_objects_async, e_test_server_utils_teardown);
+               "/ECalClient/ReceiveObjects/Async",
+               ETestServerFixture,
+               &cal_closure,
+               e_test_server_utils_setup,
+               test_receive_objects_async,
+               e_test_server_utils_teardown);
 
        return e_test_server_utils_run ();
 }
diff --git a/tests/libecal/client/test-client-refresh.c b/tests/libecal/client/test-client-refresh.c
index 09fa048..3aaa845 100644
--- a/tests/libecal/client/test-client-refresh.c
+++ b/tests/libecal/client/test-client-refresh.c
@@ -95,13 +95,22 @@ main (gint argc,
        g_type_init ();
 #endif
        g_test_init (&argc, &argv, NULL);
+       g_test_bug_base ("http://bugzilla.gnome.org/";);
 
        g_test_add (
-               "/ECalClient/Refresh/Sync", ETestServerFixture, &cal_closure,
-               e_test_server_utils_setup, test_refresh_sync, e_test_server_utils_teardown);
+               "/ECalClient/Refresh/Sync",
+               ETestServerFixture,
+               &cal_closure,
+               e_test_server_utils_setup,
+               test_refresh_sync,
+               e_test_server_utils_teardown);
        g_test_add (
-               "/ECalClient/Refresh/Async", ETestServerFixture, &cal_closure,
-               e_test_server_utils_setup, test_refresh_async, e_test_server_utils_teardown);
+               "/ECalClient/Refresh/Async",
+               ETestServerFixture,
+               &cal_closure,
+               e_test_server_utils_setup,
+               test_refresh_async,
+               e_test_server_utils_teardown);
 
        return e_test_server_utils_run ();
 }
diff --git a/tests/libecal/client/test-client-remove-object.c 
b/tests/libecal/client/test-client-remove-object.c
index 2ae31bd..ef39586 100644
--- a/tests/libecal/client/test-client-remove-object.c
+++ b/tests/libecal/client/test-client-remove-object.c
@@ -94,13 +94,22 @@ main (gint argc,
        g_type_init ();
 #endif
        g_test_init (&argc, &argv, NULL);
+       g_test_bug_base ("http://bugzilla.gnome.org/";);
 
        g_test_add (
-               "/ECalClient/RemoveObject/Sync", ETestServerFixture, &cal_closure,
-               e_test_server_utils_setup, test_remove_object_sync, e_test_server_utils_teardown);
+               "/ECalClient/RemoveObject/Sync",
+               ETestServerFixture,
+               &cal_closure,
+               e_test_server_utils_setup,
+               test_remove_object_sync,
+               e_test_server_utils_teardown);
        g_test_add (
-               "/ECalClient/RemoveObject/Async", ETestServerFixture, &cal_closure,
-               e_test_server_utils_setup, test_remove_object_async, e_test_server_utils_teardown);
+               "/ECalClient/RemoveObject/Async",
+               ETestServerFixture,
+               &cal_closure,
+               e_test_server_utils_setup,
+               test_remove_object_async,
+               e_test_server_utils_teardown);
 
        return e_test_server_utils_run ();
 }
diff --git a/tests/libecal/client/test-client-revision-view.c 
b/tests/libecal/client/test-client-revision-view.c
index ea2a5de..396298b 100644
--- a/tests/libecal/client/test-client-revision-view.c
+++ b/tests/libecal/client/test-client-revision-view.c
@@ -261,13 +261,22 @@ main (gint argc,
        g_type_init ();
 #endif
        g_test_init (&argc, &argv, NULL);
+       g_test_bug_base ("http://bugzilla.gnome.org/";);
 
        g_test_add (
-               "/ECalClient/GetRevisionView/Sync", ETestServerFixture, &cal_closure,
-               e_test_server_utils_setup, test_get_revision_view_sync, e_test_server_utils_teardown);
+               "/ECalClient/GetRevisionView/Sync",
+               ETestServerFixture,
+               &cal_closure,
+               e_test_server_utils_setup,
+               test_get_revision_view_sync,
+               e_test_server_utils_teardown);
        g_test_add (
-               "/ECalClient/GetRevisionView/Async", ETestServerFixture, &cal_closure,
-               e_test_server_utils_setup, test_get_revision_view_async, e_test_server_utils_teardown);
+               "/ECalClient/GetRevisionView/Async",
+               ETestServerFixture,
+               &cal_closure,
+               e_test_server_utils_setup,
+               test_get_revision_view_async,
+               e_test_server_utils_teardown);
 
        return e_test_server_utils_run ();
 }
diff --git a/tests/libecal/client/test-client-send-objects.c b/tests/libecal/client/test-client-send-objects.c
index 3041777..1d1a809 100644
--- a/tests/libecal/client/test-client-send-objects.c
+++ b/tests/libecal/client/test-client-send-objects.c
@@ -153,13 +153,22 @@ main (gint argc,
        g_type_init ();
 #endif
        g_test_init (&argc, &argv, NULL);
+       g_test_bug_base ("http://bugzilla.gnome.org/";);
 
        g_test_add (
-               "/ECalClient/SendObjects/Sync", ETestServerFixture, &cal_closure,
-               e_test_server_utils_setup, test_send_objects_sync, e_test_server_utils_teardown);
+               "/ECalClient/SendObjects/Sync",
+               ETestServerFixture,
+               &cal_closure,
+               e_test_server_utils_setup,
+               test_send_objects_sync,
+               e_test_server_utils_teardown);
        g_test_add (
-               "/ECalClient/SendObjects/Async", ETestServerFixture, &cal_closure,
-               e_test_server_utils_setup, test_send_objects_async, e_test_server_utils_teardown);
+               "/ECalClient/SendObjects/Async",
+               ETestServerFixture,
+               &cal_closure,
+               e_test_server_utils_setup,
+               test_send_objects_async,
+               e_test_server_utils_teardown);
 
        return e_test_server_utils_run ();
 }
diff --git a/tests/libecal/test-ecal-add-timezone.c b/tests/libecal/test-ecal-add-timezone.c
index eabb36d..65935fe 100644
--- a/tests/libecal/test-ecal-add-timezone.c
+++ b/tests/libecal/test-ecal-add-timezone.c
@@ -53,10 +53,15 @@ main (gint argc,
        g_type_init ();
 #endif
        g_test_init (&argc, &argv, NULL);
+       g_test_bug_base ("http://bugzilla.gnome.org/";);
 
        g_test_add (
-               "/ECal/AddTimezone", ETestServerFixture, &cal_closure,
-               e_test_server_utils_setup, test_add_timezone, e_test_server_utils_teardown);
+               "/ECal/AddTimezone",
+               ETestServerFixture,
+               &cal_closure,
+               e_test_server_utils_setup,
+               test_add_timezone,
+               e_test_server_utils_teardown);
 
        return e_test_server_utils_run ();
 }
diff --git a/tests/libecal/test-ecal-create-object--2.c b/tests/libecal/test-ecal-create-object--2.c
index 1d0b9f1..11ea3f6 100644
--- a/tests/libecal/test-ecal-create-object--2.c
+++ b/tests/libecal/test-ecal-create-object--2.c
@@ -49,10 +49,15 @@ main (gint argc,
        g_type_init ();
 #endif
        g_test_init (&argc, &argv, NULL);
+       g_test_bug_base ("http://bugzilla.gnome.org/";);
 
        g_test_add (
-               "/ECal/CreateObject2", ETestServerFixture, &cal_closure,
-               e_test_server_utils_setup, test_create_object_2, e_test_server_utils_teardown);
+               "/ECal/CreateObject2",
+               ETestServerFixture,
+               &cal_closure,
+               e_test_server_utils_setup,
+               test_create_object_2,
+               e_test_server_utils_teardown);
 
        return e_test_server_utils_run ();
 }
diff --git a/tests/libecal/test-ecal-create-object.c b/tests/libecal/test-ecal-create-object.c
index 53ad5a9..4a235ce 100644
--- a/tests/libecal/test-ecal-create-object.c
+++ b/tests/libecal/test-ecal-create-object.c
@@ -44,10 +44,15 @@ main (gint argc,
        g_type_init ();
 #endif
        g_test_init (&argc, &argv, NULL);
+       g_test_bug_base ("http://bugzilla.gnome.org/";);
 
        g_test_add (
-               "/ECal/CreateObject", ETestServerFixture, &cal_closure,
-               e_test_server_utils_setup, test_create_object, e_test_server_utils_teardown);
+               "/ECal/CreateObject",
+               ETestServerFixture,
+               &cal_closure,
+               e_test_server_utils_setup,
+               test_create_object,
+               e_test_server_utils_teardown);
 
        return e_test_server_utils_run ();
 }
diff --git a/tests/libecal/test-ecal-get-alarm-email-address.c 
b/tests/libecal/test-ecal-get-alarm-email-address.c
index 0dc20eb..106aba3 100644
--- a/tests/libecal/test-ecal-get-alarm-email-address.c
+++ b/tests/libecal/test-ecal-get-alarm-email-address.c
@@ -31,10 +31,15 @@ main (gint argc,
        g_type_init ();
 #endif
        g_test_init (&argc, &argv, NULL);
+       g_test_bug_base ("http://bugzilla.gnome.org/";);
 
        g_test_add (
-               "/ECal/GetAlarmEmailAddress", ETestServerFixture, &cal_closure,
-               e_test_server_utils_setup, test_get_alarm_email_address, e_test_server_utils_teardown);
+               "/ECal/GetAlarmEmailAddress",
+               ETestServerFixture,
+               &cal_closure,
+               e_test_server_utils_setup,
+               test_get_alarm_email_address,
+               e_test_server_utils_teardown);
 
        return e_test_server_utils_run ();
 }
diff --git a/tests/libecal/test-ecal-get-cal-address.c b/tests/libecal/test-ecal-get-cal-address.c
index 8d9b6ff..2950d96 100644
--- a/tests/libecal/test-ecal-get-cal-address.c
+++ b/tests/libecal/test-ecal-get-cal-address.c
@@ -31,10 +31,15 @@ main (gint argc,
        g_type_init ();
 #endif
        g_test_init (&argc, &argv, NULL);
+       g_test_bug_base ("http://bugzilla.gnome.org/";);
 
        g_test_add (
-               "/ECal/GetCalAddress", ETestServerFixture, &cal_closure,
-               e_test_server_utils_setup, test_get_cal_address, e_test_server_utils_teardown);
+               "/ECal/GetCalAddress",
+               ETestServerFixture,
+               &cal_closure,
+               e_test_server_utils_setup,
+               test_get_cal_address,
+               e_test_server_utils_teardown);
 
        return e_test_server_utils_run ();
 }
diff --git a/tests/libecal/test-ecal-get-capabilities.c b/tests/libecal/test-ecal-get-capabilities.c
index e15f763..b9fe9ce 100644
--- a/tests/libecal/test-ecal-get-capabilities.c
+++ b/tests/libecal/test-ecal-get-capabilities.c
@@ -27,10 +27,15 @@ main (gint argc,
        g_type_init ();
 #endif
        g_test_init (&argc, &argv, NULL);
+       g_test_bug_base ("http://bugzilla.gnome.org/";);
 
        g_test_add (
-               "/ECal/GetCapabilities", ETestServerFixture, &cal_closure,
-               e_test_server_utils_setup, test_get_capabilities, e_test_server_utils_teardown);
+               "/ECal/GetCapabilities",
+               ETestServerFixture,
+               &cal_closure,
+               e_test_server_utils_setup,
+               test_get_capabilities,
+               e_test_server_utils_teardown);
 
        return e_test_server_utils_run ();
 }
diff --git a/tests/libecal/test-ecal-get-default-object.c b/tests/libecal/test-ecal-get-default-object.c
index 24f25c1..8faae69 100644
--- a/tests/libecal/test-ecal-get-default-object.c
+++ b/tests/libecal/test-ecal-get-default-object.c
@@ -35,10 +35,15 @@ main (gint argc,
        g_type_init ();
 #endif
        g_test_init (&argc, &argv, NULL);
+       g_test_bug_base ("http://bugzilla.gnome.org/";);
 
        g_test_add (
-               "/ECal/GetDefaultObject", ETestServerFixture, &cal_closure,
-               e_test_server_utils_setup, test_get_default_object, e_test_server_utils_teardown);
+               "/ECal/GetDefaultObject",
+               ETestServerFixture,
+               &cal_closure,
+               e_test_server_utils_setup,
+               test_get_default_object,
+               e_test_server_utils_teardown);
 
        return e_test_server_utils_run ();
 }
diff --git a/tests/libecal/test-ecal-get-free-busy.c b/tests/libecal/test-ecal-get-free-busy.c
index f377267..b302c8c 100644
--- a/tests/libecal/test-ecal-get-free-busy.c
+++ b/tests/libecal/test-ecal-get-free-busy.c
@@ -109,10 +109,15 @@ main (gint argc,
        g_type_init ();
 #endif
        g_test_init (&argc, &argv, NULL);
+       g_test_bug_base ("http://bugzilla.gnome.org/";);
 
        g_test_add (
-               "/ECal/GetFreeBusy", ETestServerFixture, &cal_closure,
-               setup_fixture, test_get_free_busy, teardown_fixture);
+               "/ECal/GetFreeBusy",
+               ETestServerFixture,
+               &cal_closure,
+               setup_fixture,
+               test_get_free_busy,
+               teardown_fixture);
 
        return e_test_server_utils_run ();
 }
diff --git a/tests/libecal/test-ecal-get-ldap-attribute.c b/tests/libecal/test-ecal-get-ldap-attribute.c
index 9077157..81af267 100644
--- a/tests/libecal/test-ecal-get-ldap-attribute.c
+++ b/tests/libecal/test-ecal-get-ldap-attribute.c
@@ -37,10 +37,15 @@ main (gint argc,
        g_type_init ();
 #endif
        g_test_init (&argc, &argv, NULL);
+       g_test_bug_base ("http://bugzilla.gnome.org/";);
 
        g_test_add (
-               "/ECal/GetLdapAttribute/NotSupported", ETestServerFixture, &cal_closure,
-               e_test_server_utils_setup, test_get_ldap_attribute, e_test_server_utils_teardown);
+               "/ECal/GetLdapAttribute/NotSupported",
+               ETestServerFixture,
+               &cal_closure,
+               e_test_server_utils_setup,
+               test_get_ldap_attribute,
+               e_test_server_utils_teardown);
 
        return e_test_server_utils_run ();
 }
diff --git a/tests/libecal/test-ecal-get-object-list.c b/tests/libecal/test-ecal-get-object-list.c
index edf6a06..a801cbc 100644
--- a/tests/libecal/test-ecal-get-object-list.c
+++ b/tests/libecal/test-ecal-get-object-list.c
@@ -58,10 +58,15 @@ main (gint argc,
        g_type_init ();
 #endif
        g_test_init (&argc, &argv, NULL);
+       g_test_bug_base ("http://bugzilla.gnome.org/";);
 
        g_test_add (
-               "/ECal/GetObjectList", ETestServerFixture, &cal_closure,
-               e_test_server_utils_setup, test_get_object_list, e_test_server_utils_teardown);
+               "/ECal/GetObjectList",
+               ETestServerFixture,
+               &cal_closure,
+               e_test_server_utils_setup,
+               test_get_object_list,
+               e_test_server_utils_teardown);
 
        return e_test_server_utils_run ();
 }
diff --git a/tests/libecal/test-ecal-get-objects-for-uid.c b/tests/libecal/test-ecal-get-objects-for-uid.c
index b320334..334adc0 100644
--- a/tests/libecal/test-ecal-get-objects-for-uid.c
+++ b/tests/libecal/test-ecal-get-objects-for-uid.c
@@ -57,10 +57,15 @@ main (gint argc,
        g_type_init ();
 #endif
        g_test_init (&argc, &argv, NULL);
+       g_test_bug_base ("http://bugzilla.gnome.org/";);
 
        g_test_add (
-               "/ECal/GetObjectsForUid", ETestServerFixture, &cal_closure,
-               e_test_server_utils_setup, test_get_objects_for_uid, e_test_server_utils_teardown);
+               "/ECal/GetObjectsForUid",
+               ETestServerFixture,
+               &cal_closure,
+               e_test_server_utils_setup,
+               test_get_objects_for_uid,
+               e_test_server_utils_teardown);
 
        return e_test_server_utils_run ();
 }
diff --git a/tests/libecal/test-ecal-get-query.c b/tests/libecal/test-ecal-get-query.c
index 58703fb..f2c2a31 100644
--- a/tests/libecal/test-ecal-get-query.c
+++ b/tests/libecal/test-ecal-get-query.c
@@ -194,10 +194,15 @@ main (gint argc,
        g_type_init ();
 #endif
        g_test_init (&argc, &argv, NULL);
+       g_test_bug_base ("http://bugzilla.gnome.org/";);
 
        g_test_add (
-               "/ECal/GetQuery", ETestServerFixture, &cal_closure,
-               e_test_server_utils_setup, test_get_query, e_test_server_utils_teardown);
+               "/ECal/GetQuery",
+               ETestServerFixture,
+               &cal_closure,
+               e_test_server_utils_setup,
+               test_get_query,
+               e_test_server_utils_teardown);
 
        return e_test_server_utils_run ();
 }
diff --git a/tests/libecal/test-ecal-get-timezone.c b/tests/libecal/test-ecal-get-timezone.c
index 09ff91a..30271b8 100644
--- a/tests/libecal/test-ecal-get-timezone.c
+++ b/tests/libecal/test-ecal-get-timezone.c
@@ -34,10 +34,15 @@ main (gint argc,
        g_type_init ();
 #endif
        g_test_init (&argc, &argv, NULL);
+       g_test_bug_base ("http://bugzilla.gnome.org/";);
 
        g_test_add (
-               "/ECal/GetTimezone", ETestServerFixture, &cal_closure,
-               e_test_server_utils_setup, test_get_timezone, e_test_server_utils_teardown);
+               "/ECal/GetTimezone",
+               ETestServerFixture,
+               &cal_closure,
+               e_test_server_utils_setup,
+               test_get_timezone,
+               e_test_server_utils_teardown);
 
        return e_test_server_utils_run ();
 }
diff --git a/tests/libecal/test-ecal-modify-object.c b/tests/libecal/test-ecal-modify-object.c
index 39576ca..fd79753 100644
--- a/tests/libecal/test-ecal-modify-object.c
+++ b/tests/libecal/test-ecal-modify-object.c
@@ -73,10 +73,15 @@ main (gint argc,
        g_type_init ();
 #endif
        g_test_init (&argc, &argv, NULL);
+       g_test_bug_base ("http://bugzilla.gnome.org/";);
 
        g_test_add (
-               "/ECal/ModifyObject", ETestServerFixture, &cal_closure,
-               e_test_server_utils_setup, test_modify_object, e_test_server_utils_teardown);
+               "/ECal/ModifyObject",
+               ETestServerFixture,
+               &cal_closure,
+               e_test_server_utils_setup,
+               test_modify_object,
+               e_test_server_utils_teardown);
 
        return e_test_server_utils_run ();
 }
diff --git a/tests/libecal/test-ecal-receive-objects.c b/tests/libecal/test-ecal-receive-objects.c
index 8c9320f..840fa05 100644
--- a/tests/libecal/test-ecal-receive-objects.c
+++ b/tests/libecal/test-ecal-receive-objects.c
@@ -42,10 +42,15 @@ main (gint argc,
        g_type_init ();
 #endif
        g_test_init (&argc, &argv, NULL);
+       g_test_bug_base ("http://bugzilla.gnome.org/";);
 
        g_test_add (
-               "/ECal/ReceiveObjects", ETestServerFixture, &cal_closure,
-               e_test_server_utils_setup, test_receive_objects, e_test_server_utils_teardown);
+               "/ECal/ReceiveObjects",
+               ETestServerFixture,
+               &cal_closure,
+               e_test_server_utils_setup,
+               test_receive_objects,
+               e_test_server_utils_teardown);
 
        return e_test_server_utils_run ();
 }
diff --git a/tests/libecal/test-ecal-remove-object.c b/tests/libecal/test-ecal-remove-object.c
index 5420503..39422c5 100644
--- a/tests/libecal/test-ecal-remove-object.c
+++ b/tests/libecal/test-ecal-remove-object.c
@@ -45,10 +45,15 @@ main (gint argc,
        g_type_init ();
 #endif
        g_test_init (&argc, &argv, NULL);
+       g_test_bug_base ("http://bugzilla.gnome.org/";);
 
        g_test_add (
-               "/ECal/RemoveObject", ETestServerFixture, &cal_closure,
-               e_test_server_utils_setup, test_remove_object, e_test_server_utils_teardown);
+               "/ECal/RemoveObject",
+               ETestServerFixture,
+               &cal_closure,
+               e_test_server_utils_setup,
+               test_remove_object,
+               e_test_server_utils_teardown);
 
        return e_test_server_utils_run ();
 }
diff --git a/tests/libecal/test-ecal-send-objects.c b/tests/libecal/test-ecal-send-objects.c
index bb84600..48553fd 100644
--- a/tests/libecal/test-ecal-send-objects.c
+++ b/tests/libecal/test-ecal-send-objects.c
@@ -51,10 +51,15 @@ main (gint argc,
        g_type_init ();
 #endif
        g_test_init (&argc, &argv, NULL);
+       g_test_bug_base ("http://bugzilla.gnome.org/";);
 
        g_test_add (
-               "/ECal/SendObjects", ETestServerFixture, &cal_closure,
-               e_test_server_utils_setup, test_send_objects, e_test_server_utils_teardown);
+               "/ECal/SendObjects",
+               ETestServerFixture,
+               &cal_closure,
+               e_test_server_utils_setup,
+               test_send_objects,
+               e_test_server_utils_teardown);
 
        return e_test_server_utils_run ();
 }
diff --git a/tests/libecal/test-ecal-set-default-timezone.c b/tests/libecal/test-ecal-set-default-timezone.c
index 267f5ae..d8c40a4 100644
--- a/tests/libecal/test-ecal-set-default-timezone.c
+++ b/tests/libecal/test-ecal-set-default-timezone.c
@@ -57,10 +57,15 @@ main (gint argc,
        g_type_init ();
 #endif
        g_test_init (&argc, &argv, NULL);
+       g_test_bug_base ("http://bugzilla.gnome.org/";);
 
        g_test_add (
-               "/ECal/SetDefaultTimezone", ETestServerFixture, &cal_closure,
-               e_test_server_utils_setup, test_set_default_timezone, e_test_server_utils_teardown);
+               "/ECal/SetDefaultTimezone",
+               ETestServerFixture,
+               &cal_closure,
+               e_test_server_utils_setup,
+               test_set_default_timezone,
+               e_test_server_utils_teardown);
 
        return e_test_server_utils_run ();
 }
diff --git a/tests/libedataserver/e-source-test.c b/tests/libedataserver/e-source-test.c
index f66bdcf..ca383c1 100644
--- a/tests/libedataserver/e-source-test.c
+++ b/tests/libedataserver/e-source-test.c
@@ -233,6 +233,7 @@ main (gint argc,
        g_type_init ();
 
        g_test_init (&argc, &argv, NULL);
+       g_test_bug_base ("http://bugzilla.gnome.org/";);
 
        g_test_add (
                "/e-source-test/SingleSource",
diff --git a/tests/test-server-utils/e-test-server-utils.c b/tests/test-server-utils/e-test-server-utils.c
index 2f93c22..faefffd 100644
--- a/tests/test-server-utils/e-test-server-utils.c
+++ b/tests/test-server-utils/e-test-server-utils.c
@@ -120,18 +120,18 @@ e_test_server_utils_bootstrap_timeout (FixturePair *pair)
 
 static void
 registry_weak_notify (gpointer data,
-                     GObject *where_the_object_was)
+                      GObject *where_the_object_was)
 {
-       ETestServerFixture *fixture = (ETestServerFixture *)data;
+       ETestServerFixture *fixture = (ETestServerFixture *) data;
 
        fixture->registry_finalized = TRUE;
 }
 
 static void
 client_weak_notify (gpointer data,
-                   GObject *where_the_object_was)
+                    GObject *where_the_object_was)
 {
-       ETestServerFixture *fixture = (ETestServerFixture *)data;
+       ETestServerFixture *fixture = (ETestServerFixture *) data;
 
        fixture->client_finalized = TRUE;
 }
@@ -160,8 +160,9 @@ e_test_server_utils_source_added (ESourceRegistry *registry,
                if (!pair->fixture->service.book_client)
                        g_error ("Unable to create the test book: %s", error->message);
 
-               g_object_weak_ref (G_OBJECT (pair->fixture->service.book_client),
-                                  client_weak_notify, pair->fixture);
+               g_object_weak_ref (
+                       G_OBJECT (pair->fixture->service.book_client),
+                       client_weak_notify, pair->fixture);
 
                break;
 
@@ -174,8 +175,9 @@ e_test_server_utils_source_added (ESourceRegistry *registry,
                if (!e_book_open (pair->fixture->service.book, FALSE, &error))
                        g_error ("Unable to open book: %s", error->message);
 
-               g_object_weak_ref (G_OBJECT (pair->fixture->service.book),
-                                  client_weak_notify, pair->fixture);
+               g_object_weak_ref (
+                       G_OBJECT (pair->fixture->service.book),
+                       client_weak_notify, pair->fixture);
 
                break;
 
@@ -188,8 +190,9 @@ e_test_server_utils_source_added (ESourceRegistry *registry,
                if (!pair->fixture->service.calendar_client)
                        g_error ("Unable to create the test calendar: %s", error->message);
 
-               g_object_weak_ref (G_OBJECT (pair->fixture->service.calendar_client),
-                                  client_weak_notify, pair->fixture);
+               g_object_weak_ref (
+                       G_OBJECT (pair->fixture->service.calendar_client),
+                       client_weak_notify, pair->fixture);
 
                break;
 
@@ -202,8 +205,9 @@ e_test_server_utils_source_added (ESourceRegistry *registry,
                if (!e_cal_open (pair->fixture->service.calendar, FALSE, &error))
                        g_error ("Unable to open calendar: %s", error->message);
 
-               g_object_weak_ref (G_OBJECT (pair->fixture->service.calendar),
-                                  client_weak_notify, pair->fixture);
+               g_object_weak_ref (
+                       G_OBJECT (pair->fixture->service.calendar),
+                       client_weak_notify, pair->fixture);
 
                break;
 
@@ -226,8 +230,9 @@ e_test_server_utils_bootstrap_idle (FixturePair *pair)
        if (!pair->fixture->registry)
                g_error ("Unable to create the test registry: %s", error->message);
 
-       g_object_weak_ref (G_OBJECT (pair->fixture->registry),
-                          registry_weak_notify, pair->fixture);
+       g_object_weak_ref (
+               G_OBJECT (pair->fixture->registry),
+               registry_weak_notify, pair->fixture);
 
        g_signal_connect (
                pair->fixture->registry, "source-added",
diff --git a/tests/test-server-utils/test-fixture.c b/tests/test-server-utils/test-fixture.c
index d665b59..e976063 100644
--- a/tests/test-server-utils/test-fixture.c
+++ b/tests/test-server-utils/test-fixture.c
@@ -53,6 +53,7 @@ main (gint argc,
        g_type_init ();
 #endif
        g_test_init (&argc, &argv, NULL);
+       g_test_bug_base ("http://bugzilla.gnome.org/";);
 
        registry_keys = g_new0 (gchar *, N_CYCLES);
        book_keys = g_new0 (gchar *, N_CYCLES);
@@ -63,36 +64,56 @@ main (gint argc,
        for (i = 0; i < N_CYCLES; i++) {
                registry_keys[i] = g_strdup_printf ("/Fixture/Registry%d", i);
                g_test_add (
-                       registry_keys[i], ETestServerFixture, &registry_closure,
-                       e_test_server_utils_setup, empty_test, e_test_server_utils_teardown);
+                       registry_keys[i],
+                       ETestServerFixture,
+                       &registry_closure,
+                       e_test_server_utils_setup,
+                       empty_test,
+                       e_test_server_utils_teardown);
        }
 
        for (i = 0; i < N_CYCLES; i++) {
                book_keys[i] = g_strdup_printf ("/Fixture/Book%d", i);
                g_test_add (
-                       book_keys[i], ETestServerFixture, &book_closure,
-                       e_test_server_utils_setup, empty_test, e_test_server_utils_teardown);
+                       book_keys[i],
+                       ETestServerFixture,
+                       &book_closure,
+                       e_test_server_utils_setup,
+                       empty_test,
+                       e_test_server_utils_teardown);
        }
 
        for (i = 0; i < N_CYCLES; i++) {
                calendar_keys[i] = g_strdup_printf ("/Fixture/Calendar%d", i);
                g_test_add (
-                       calendar_keys[i], ETestServerFixture, &calendar_closure,
-                       e_test_server_utils_setup, empty_test, e_test_server_utils_teardown);
+                       calendar_keys[i],
+                       ETestServerFixture,
+                       &calendar_closure,
+                       e_test_server_utils_setup,
+                       empty_test,
+                       e_test_server_utils_teardown);
        }
 
        for (i = 0; i < N_CYCLES; i++) {
                deprecated_book_keys[i] = g_strdup_printf ("/Fixture/Deprecated/Book%d", i);
                g_test_add (
-                       deprecated_book_keys[i], ETestServerFixture, &deprecated_book_closure,
-                       e_test_server_utils_setup, empty_test, e_test_server_utils_teardown);
+                       deprecated_book_keys[i],
+                       ETestServerFixture,
+                       &deprecated_book_closure,
+                       e_test_server_utils_setup,
+                       empty_test,
+                       e_test_server_utils_teardown);
        }
 
        for (i = 0; i < N_CYCLES; i++) {
                deprecated_calendar_keys[i] = g_strdup_printf ("/Fixture/Deprecated/Calendar%d", i);
                g_test_add (
-                       deprecated_calendar_keys[i], ETestServerFixture, &deprecated_calendar_closure,
-                       e_test_server_utils_setup, empty_test, e_test_server_utils_teardown);
+                       deprecated_calendar_keys[i],
+                       ETestServerFixture,
+                       &deprecated_calendar_closure,
+                       e_test_server_utils_setup,
+                       empty_test,
+                       e_test_server_utils_teardown);
        }
 
        ret = e_test_server_utils_run ();


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]