Gearman

Merge lp:~brianaker/gearmand/exception-testing into lp:gearmand

  1. exception-testing
  2. Merge into 1.2
Proposed by Brian Aker
Status: Merged
Merged at revision: 787
Proposed branch: lp:~brianaker/gearmand/exception-testing
Merge into: lp:gearmand
Diff against target: 25 lines (+3/-1)
2 files modified
tests/libgearman-1.0/task.cc (+2/-1)
tests/libgearman-1.0/worker_test.cc (+1/-0)
To merge this branch: bzr merge lp:~brianaker/gearmand/exception-testing
Reviewer Review Type Date Requested Status
Tangent Trunk Pending
Review via email: mp+171706@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'tests/libgearman-1.0/task.cc'
2--- tests/libgearman-1.0/task.cc 2013-03-15 21:54:07 +0000
3+++ tests/libgearman-1.0/task.cc 2013-06-27 03:04:25 +0000
4@@ -306,7 +306,8 @@
5 } while (gearman_continue(ret));
6 ASSERT_EQ(ret, GEARMAN_SUCCESS);
7
8- test_truth(exception_success);
9+ ASSERT_TRUE(gearman_task_has_exception(task));
10+ ASSERT_TRUE(exception_success);
11
12 gearman_client_set_exception_fn(client, NULL);
13
14
15=== modified file 'tests/libgearman-1.0/worker_test.cc'
16--- tests/libgearman-1.0/worker_test.cc 2013-06-23 08:23:26 +0000
17+++ tests/libgearman-1.0/worker_test.cc 2013-06-27 03:04:25 +0000
18@@ -840,6 +840,7 @@
19
20 gearman_string_t exception= gearman_task_exception(task);
21 ASSERT_EQ(gearman_task_return(task), GEARMAN_WORK_EXCEPTION);
22+ ASSERT_TRUE(gearman_task_has_exception(task));
23 ASSERT_STREQ("dog", gearman_c_str(exception));
24
25 return TEST_SUCCESS;

Subscribers

People subscribed via source and target branches

to all changes: