[evolution-data-server/openismus-work-master: 7/7] test-client-view-operations: Use sync calls
- From: Tristan Van Berkom <tvb src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [evolution-data-server/openismus-work-master: 7/7] test-client-view-operations: Use sync calls
- Date: Thu, 14 Feb 2013 08:10:33 +0000 (UTC)
commit 9bd2ff9e34723ef9644bd3c8766504f39368e080
Author: Tristan Van Berkom <tristanvb openismus com>
Date: Fri Feb 1 17:34:14 2013 +0900
test-client-view-operations: Use sync calls
This works around some regressions in recent master.
.../libebook/client/test-client-view-operations.c | 47 ++++++--------------
1 files changed, 14 insertions(+), 33 deletions(-)
---
diff --git a/tests/libebook/client/test-client-view-operations.c
b/tests/libebook/client/test-client-view-operations.c
index e1e6c01..0b8fc7a 100644
--- a/tests/libebook/client/test-client-view-operations.c
+++ b/tests/libebook/client/test-client-view-operations.c
@@ -10,7 +10,7 @@
static ETestServerClosure book_closure = { E_TEST_SERVER_ADDRESS_BOOK, NULL, 0 };
-#define N_THREADS 20
+#define N_THREADS 5
#define N_CONTACTS 5
typedef struct {
@@ -78,14 +78,21 @@ complete (EBookClientView *view,
g_mutex_unlock (&data->complete_mutex);
}
-static void
-view_ready (GObject *source_object,
- GAsyncResult *result,
- ThreadData *data)
+static gboolean
+start_view (ThreadData *data)
{
+ EBookQuery *query;
+ gchar *sexp;
GError *error = NULL;
- if (!e_book_client_get_view_finish (E_BOOK_CLIENT (source_object), result, &(data->view), &error))
+ if (!e_client_open_sync (E_CLIENT (data->client), TRUE, NULL, &error))
+ g_error ("Error opening the client: %s", error->message);
+
+ query = e_book_query_any_field_contains ("");
+ sexp = e_book_query_to_string (query);
+
+ if (!e_book_client_get_view_sync (data->client, sexp,
+ &(data->view), NULL, &error))
g_error ("Error getting view: %s", error->message);
g_signal_connect (data->view, "objects-added", G_CALLBACK (objects_added), data);
@@ -100,18 +107,6 @@ view_ready (GObject *source_object,
e_book_client_view_start (data->view, &error);
if (error)
g_error ("start view: %s", error->message);
-}
-
-static gboolean
-start_view (ThreadData *data)
-{
- EBookQuery *query;
- gchar *sexp;
-
- query = e_book_query_any_field_contains ("");
- sexp = e_book_query_to_string (query);
-
- e_book_client_get_view (data->client, sexp, NULL, (GAsyncReadyCallback)view_ready, data);
e_book_query_unref (query);
g_free (sexp);
@@ -144,20 +139,6 @@ finish_thread_test (ThreadData *data)
g_slice_free (ThreadData, data);
}
-static void
-client_ready (GObject *source_object,
- GAsyncResult *res,
- ThreadData *data)
-{
- GError *error = NULL;
-
- if (!e_client_open_finish (E_CLIENT (source_object), res, &error))
- g_error ("Error opening client: %s",
- error->message);
-
- start_thread_test (data);
-}
-
static gpointer
test_view_thread (ThreadData *data)
{
@@ -187,7 +168,7 @@ test_view_thread (ThreadData *data)
if (!data->client)
g_error ("Unable to create EBookClient for uid '%s': %s", data->book_uid, error->message);
- e_client_open (E_CLIENT (data->client), TRUE, NULL, (GAsyncReadyCallback)client_ready, data);
+ start_thread_test (data);
g_main_loop_run (data->loop);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]