summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFelipe Magno de Almeida <felipe@expertisesolutions.com.br>2016-05-26 13:34:04 -0300
committerFelipe Magno de Almeida <felipe@expertisesolutions.com.br>2016-05-26 13:35:07 -0300
commitb0b8109cd5dbe295f3024b98723336bbb89feda8 (patch)
treeaa198f73ff1ed77f2ebcb3e5bf3a0c227bbad888
parentb7cdcff56a6e214ccb70ea761bbbbfdfc24a310a (diff)
downloadefl-b0b8109cd5dbe295f3024b98723336bbb89feda8.tar.gz
eina: Make cancelled promises use EINA_ERROR_PROMISE_CANCELLED error code
-rw-r--r--src/lib/eina/eina_promise.c1
-rw-r--r--src/tests/ecore/ecore_test_promise.c2
2 files changed, 2 insertions, 1 deletions
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();
}