From b0b8109cd5dbe295f3024b98723336bbb89feda8 Mon Sep 17 00:00:00 2001 From: Felipe Magno de Almeida Date: Thu, 26 May 2016 13:34:04 -0300 Subject: eina: Make cancelled promises use EINA_ERROR_PROMISE_CANCELLED error code --- src/lib/eina/eina_promise.c | 1 + src/tests/ecore/ecore_test_promise.c | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/lib/eina/eina_promise.c b/src/lib/eina/eina_promise.c index d7b538ea78..2b3f154f7d 100644 --- a/src/lib/eina/eina_promise.c +++ b/src/lib/eina/eina_promise.c @@ -396,6 +396,7 @@ _eina_promise_cancel(_Eina_Promise_Default* promise) owner->promise.is_cancelled = EINA_TRUE; owner->promise.has_finished = EINA_TRUE; owner->promise.has_errored = EINA_TRUE; + owner->promise.error = EINA_ERROR_PROMISE_CANCEL; _eina_promise_cancel_calls(owner, EINA_TRUE); } } diff --git a/src/tests/ecore/ecore_test_promise.c b/src/tests/ecore/ecore_test_promise.c index bf2a16076a..decd5c9588 100644 --- a/src/tests/ecore/ecore_test_promise.c +++ b/src/tests/ecore/ecore_test_promise.c @@ -329,7 +329,7 @@ static void _cancel_callback(const void* data, Eina_Promise_Owner* promise EINA_ static void _cancel_promise_callback(void* data EINA_UNUSED, Eina_Error value, Eina_Promise* promise EINA_UNUSED) { - ck_assert(!!value); + ck_assert(value == EINA_ERROR_PROMISE_CANCEL); ecore_main_loop_quit(); } -- cgit v1.2.1