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/03/22 13:34:16 UTC
[1/3] chttpd commit: updated refs/heads/master to cefabd0
Repository: couchdb-chttpd
Updated Branches:
refs/heads/master ab299ebfc -> cefabd0ec
Use couch_tests applications for chttpd_plugin_tests
Project: http://git-wip-us.apache.org/repos/asf/couchdb-chttpd/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-chttpd/commit/46de497c
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-chttpd/tree/46de497c
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-chttpd/diff/46de497c
Branch: refs/heads/master
Commit: 46de497cddf2785e7afdf7f3f5c92132b819a762
Parents: ab299eb
Author: ILYA Khlopotov <ii...@ca.ibm.com>
Authored: Thu Mar 17 10:36:53 2016 -0700
Committer: ILYA Khlopotov <ii...@ca.ibm.com>
Committed: Thu Mar 17 10:36:53 2016 -0700
----------------------------------------------------------------------
test/chttpd_plugin_tests.erl | 16 +++++++---------
1 file changed, 7 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-chttpd/blob/46de497c/test/chttpd_plugin_tests.erl
----------------------------------------------------------------------
diff --git a/test/chttpd_plugin_tests.erl b/test/chttpd_plugin_tests.erl
index e8d68b5..4b6334f 100644
--- a/test/chttpd_plugin_tests.erl
+++ b/test/chttpd_plugin_tests.erl
@@ -43,16 +43,14 @@ data_subscriptions() -> [].
processes() -> [].
notify(_, _, _) -> ok.
+
setup() ->
- application:stop(couch_epi), % in case it's already running from other tests...
- application:unload(couch_epi),
- ok = application:load(couch_epi),
- ok = application:set_env(couch_epi, plugins, [?MODULE]), % only this plugin
- ok = application:start(couch_epi).
-
-teardown(_) ->
- ok = application:stop(couch_epi),
- ok = application:unload(couch_epi).
+ couch_tests:setup([
+ couch_epi_dispatch:dispatch(chttpd, ?MODULE)
+ ], [], []).
+
+teardown(Ctx) ->
+ couch_tests:teardown(Ctx).
before_request({true, Id}) -> [{true, [{before_request, Id}]}];
before_request({false, Id}) -> [{false, Id}];
[3/3] chttpd commit: updated refs/heads/master to cefabd0
Posted by ii...@apache.org.
Merge remote branch 'github/pr/108'
This closes #108
Signed-off-by: ILYA Khlopotov <ii...@ca.ibm.com>
Project: http://git-wip-us.apache.org/repos/asf/couchdb-chttpd/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-chttpd/commit/cefabd0e
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-chttpd/tree/cefabd0e
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-chttpd/diff/cefabd0e
Branch: refs/heads/master
Commit: cefabd0ece7db0e1cf4bf4abe7214d226340280a
Parents: ab299eb 54e8f61
Author: ILYA Khlopotov <ii...@ca.ibm.com>
Authored: Tue Mar 22 05:33:56 2016 -0700
Committer: ILYA Khlopotov <ii...@ca.ibm.com>
Committed: Tue Mar 22 05:33:56 2016 -0700
----------------------------------------------------------------------
test/chttpd_plugin_tests.erl | 16 +++++++---------
1 file changed, 7 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
[2/3] chttpd commit: updated refs/heads/master to cefabd0
Posted by ii...@apache.org.
Use couch_tests:setup/1
Project: http://git-wip-us.apache.org/repos/asf/couchdb-chttpd/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-chttpd/commit/54e8f614
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-chttpd/tree/54e8f614
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-chttpd/diff/54e8f614
Branch: refs/heads/master
Commit: 54e8f6147486d9afc5245e0143d15a4dd1185654
Parents: 46de497
Author: ILYA Khlopotov <ii...@ca.ibm.com>
Authored: Thu Mar 17 10:59:01 2016 -0700
Committer: ILYA Khlopotov <ii...@ca.ibm.com>
Committed: Thu Mar 17 10:59:01 2016 -0700
----------------------------------------------------------------------
test/chttpd_plugin_tests.erl | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-chttpd/blob/54e8f614/test/chttpd_plugin_tests.erl
----------------------------------------------------------------------
diff --git a/test/chttpd_plugin_tests.erl b/test/chttpd_plugin_tests.erl
index 4b6334f..36572a4 100644
--- a/test/chttpd_plugin_tests.erl
+++ b/test/chttpd_plugin_tests.erl
@@ -47,7 +47,7 @@ notify(_, _, _) -> ok.
setup() ->
couch_tests:setup([
couch_epi_dispatch:dispatch(chttpd, ?MODULE)
- ], [], []).
+ ]).
teardown(Ctx) ->
couch_tests:teardown(Ctx).