couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From klaus_trai...@apache.org
Subject [2/2] couch commit: updated refs/heads/master to 100bb30
Date Wed, 30 Sep 2015 13:42:28 GMT
Ensure clean teardown in os_daemons_test

We want to call `test_util:stop/1` at the end of the `os_daemons_test`
`teardown/2` function, so that we have a clean teardown without a
timeout exception being thrown.


Project: http://git-wip-us.apache.org/repos/asf/couchdb-couch/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-couch/commit/100bb301
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-couch/tree/100bb301
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-couch/diff/100bb301

Branch: refs/heads/master
Commit: 100bb301c2e9c09298e010f1699c7aa1f0ff9bc2
Parents: 2ee5e28
Author: Klaus Trainer <klaus_trainer@posteo.de>
Authored: Wed Sep 30 15:37:39 2015 +0200
Committer: Klaus Trainer <klaus_trainer@posteo.de>
Committed: Wed Sep 30 15:37:41 2015 +0200

----------------------------------------------------------------------
 test/couchdb_os_daemons_tests.erl | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb-couch/blob/100bb301/test/couchdb_os_daemons_tests.erl
----------------------------------------------------------------------
diff --git a/test/couchdb_os_daemons_tests.erl b/test/couchdb_os_daemons_tests.erl
index 0cab7b7..7ec70a9 100644
--- a/test/couchdb_os_daemons_tests.erl
+++ b/test/couchdb_os_daemons_tests.erl
@@ -45,10 +45,10 @@ setup(DName) ->
     {Ctx, OsDPid}.
 
 teardown(_, {Ctx, OsDPid}) ->
-    test_util:stop(Ctx),
     test_util:stop_sync_throw(OsDPid, fun() ->
         exit(OsDPid, shutdown)
-    end, {timeout, os_daemon_stop}, ?TIMEOUT).
+    end, {timeout, os_daemon_stop}, ?TIMEOUT),
+    test_util:stop(Ctx).
 
 
 os_daemons_test_() ->


Mime
View raw message