[05/12] couch commit: updated refs/heads/2938-fix-5986-filtered-changes to 9171d5a

[ch...@apache.org]

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/2938-fix-5986-filtered-changes
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.