You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by ii...@apache.org on 2016/02/17 03:00:53 UTC
[1/2] couch commit: updated refs/heads/master to d08ce07
Repository: couchdb-couch
Updated Branches:
refs/heads/master e928e83bd -> d08ce076f
Fix test_util:with_process_restart
- The order of arguments is incorrect.
- Return the result of stop_sync from with_process_restart/3
Project: http://git-wip-us.apache.org/repos/asf/couchdb-couch/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-couch/commit/99d408a4
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-couch/tree/99d408a4
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-couch/diff/99d408a4
Branch: refs/heads/master
Commit: 99d408a4a776439489fbeb1940618f16ff4d5db5
Parents: e928e83
Author: ILYA Khlopotov <ii...@ca.ibm.com>
Authored: Mon Feb 15 15:25:47 2016 -0800
Committer: ILYA Khlopotov <ii...@ca.ibm.com>
Committed: Tue Feb 16 16:35:14 2016 -0800
----------------------------------------------------------------------
src/test_util.erl | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-couch/blob/99d408a4/src/test_util.erl
----------------------------------------------------------------------
diff --git a/src/test_util.erl b/src/test_util.erl
index 87edafa..88cfc63 100644
--- a/src/test_util.erl
+++ b/src/test_util.erl
@@ -164,19 +164,19 @@ stop_sync_throw(Pid, Fun, Error, Timeout) ->
with_process_restart(Name) ->
{Pid, true} = with_process_restart(
- fun() -> exit(whereis(Name), shutdown) end, Name),
+ Name, fun() -> exit(whereis(Name), shutdown) end),
Pid.
with_process_restart(Name, Fun) ->
with_process_restart(Name, Fun, 5000).
with_process_restart(Name, Fun, Timeout) ->
- ok = stop_sync(Name, Fun),
+ Res = stop_sync(Name, Fun),
case wait_process(Name, Timeout) of
timeout ->
timeout;
Pid ->
- Pid
+ {Pid, Res}
end.
[2/2] couch commit: updated refs/heads/master to d08ce07
Posted by ii...@apache.org.
Merge remote-tracking branch 'github/pr/140'
Project: http://git-wip-us.apache.org/repos/asf/couchdb-couch/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-couch/commit/d08ce076
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-couch/tree/d08ce076
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-couch/diff/d08ce076
Branch: refs/heads/master
Commit: d08ce076f4c3b5901bd34995d4a00f69c2177792
Parents: e928e83 99d408a
Author: ILYA Khlopotov <ii...@ca.ibm.com>
Authored: Tue Feb 16 18:02:09 2016 -0800
Committer: ILYA Khlopotov <ii...@ca.ibm.com>
Committed: Tue Feb 16 18:02:09 2016 -0800
----------------------------------------------------------------------
src/test_util.erl | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------