You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by kl...@apache.org on 2015/09/30 15:42:27 UTC
[1/2] couch commit: updated refs/heads/master to 100bb30
Repository: couchdb-couch
Updated Branches:
refs/heads/master 9afa6a097 -> 100bb301c
Fix couchdb_os_daemons tests dependency.
couchdb_os_daemons_tests.erl was failing in
setup if run on its own:
```
... apps=couch tests=os_daemons_test_
```
with an exception:
```
**exit:{{{badmatch,undefined},
[{couch_log,notice,2,[{file,"src/couch_log.erl"},{line,44}]},
{config,handle_call,3,[{file,"src/config.erl"},{line,211}]},
```
because it depends on couch_log. So add couch_log as a dependency
in setup.
COUCHDB-2830
Project: http://git-wip-us.apache.org/repos/asf/couchdb-couch/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-couch/commit/2ee5e28d
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-couch/tree/2ee5e28d
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-couch/diff/2ee5e28d
Branch: refs/heads/master
Commit: 2ee5e28d0208188a9f99b513793b31a0e28f8139
Parents: 9afa6a0
Author: Nick Vatamaniuc <va...@gmail.com>
Authored: Tue Sep 29 20:06:09 2015 -0400
Committer: Nick Vatamaniuc <va...@gmail.com>
Committed: Tue Sep 29 20:06:09 2015 -0400
----------------------------------------------------------------------
test/couchdb_os_daemons_tests.erl | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-couch/blob/2ee5e28d/test/couchdb_os_daemons_tests.erl
----------------------------------------------------------------------
diff --git a/test/couchdb_os_daemons_tests.erl b/test/couchdb_os_daemons_tests.erl
index fe59005..0cab7b7 100644
--- a/test/couchdb_os_daemons_tests.erl
+++ b/test/couchdb_os_daemons_tests.erl
@@ -37,7 +37,7 @@
setup(DName) ->
- Ctx = test_util:start(?MODULE, [], [{dont_mock, [config]}]),
+ Ctx = test_util:start(?MODULE, [couch_log], [{dont_mock, [config]}]),
{ok, OsDPid} = couch_os_daemons:start_link(),
config:set("os_daemons", DName,
filename:join([?FIXTURESDIR, DName]), false),
[2/2] couch commit: updated refs/heads/master to 100bb30
Posted by kl...@apache.org.
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 <kl...@posteo.de>
Authored: Wed Sep 30 15:37:39 2015 +0200
Committer: Klaus Trainer <kl...@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_() ->