You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by be...@apache.org on 2014/01/09 20:56:45 UTC
git commit: updated refs/heads/1994-merge-rcouch to 5a865ac
Updated Branches:
refs/heads/1994-merge-rcouch 78c1a3f9f -> 5a865ac63
fix tests
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/5a865ac6
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/5a865ac6
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/5a865ac6
Branch: refs/heads/1994-merge-rcouch
Commit: 5a865ac63001dda2376fe2924a38dd5c69cec6ba
Parents: 78c1a3f
Author: Benoit Chesneau <be...@apache.org>
Authored: Thu Jan 9 20:56:15 2014 +0100
Committer: Benoit Chesneau <be...@apache.org>
Committed: Thu Jan 9 20:56:15 2014 +0100
----------------------------------------------------------------------
Makefile | 4 ++++
src/apps/couch/src/couch.app.src.script | 2 +-
src/apps/couch/src/couch.erl | 1 -
src/apps/couch/src/couch_util.erl | 1 +
src/apps/couch_replicator/src/couch_replicator_sup.erl | 6 +++++-
src/apps/couch_replicator/test/03-replication-compact.t | 5 ++++-
src/test/etap/021-btree-reductions.t | 2 +-
src/test/etap/042-work-queue.t | 2 +-
src/test/etap/050-stream.t | 3 ++-
src/test/etap/073-changes.t | 2 +-
src/test/etap/150-invalid-view-seq.t | 5 +++--
src/test/etap/200-view-group-no-db-leaks.t | 1 +
src/test/etap/test_util.erl | 4 +---
13 files changed, 25 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/5a865ac6/Makefile
----------------------------------------------------------------------
diff --git a/Makefile b/Makefile
index 7816f89..dd86765 100644
--- a/Makefile
+++ b/Makefile
@@ -68,6 +68,10 @@ test: deps compile testbuild
prove $(BASE_DIR)/src/apps/couch_mrview/test/*.t
prove $(BASE_DIR)/src/apps/couch_replicator/test/*.t
+verbose-test: deps compile testbuild
+ prove -v $(COUCHDB_ETAP_DIR)/*.t
+ prove -v $(BASE_DIR)/src/apps/couch_mrview/test/*.t
+ prove -v $(BASE_DIR)/src/apps/couch_replicator/test/*.t
testbuild: testclean
$(ERLC) -v -o $(COUCHDB_ETAP_DIR) $(COUCHDB_ETAP_DIR)/etap.erl
http://git-wip-us.apache.org/repos/asf/couchdb/blob/5a865ac6/src/apps/couch/src/couch.app.src.script
----------------------------------------------------------------------
diff --git a/src/apps/couch/src/couch.app.src.script b/src/apps/couch/src/couch.app.src.script
index 599efee..c947ead 100644
--- a/src/apps/couch/src/couch.app.src.script
+++ b/src/apps/couch/src/couch.app.src.script
@@ -61,7 +61,7 @@ end,
]},
{mod, {couch_app, []}},
{env, [{couch_rel, RelVsn}]},
- {applications, [kernel, stdlib, crypto, sasl, public_key, ssl,
+ {applications, [kernel, stdlib, crypto, sasl, asn1, public_key, ssl,
inets, oauth, ibrowse, mochiweb, os_mon]}
]}
].
http://git-wip-us.apache.org/repos/asf/couchdb/blob/5a865ac6/src/apps/couch/src/couch.erl
----------------------------------------------------------------------
diff --git a/src/apps/couch/src/couch.erl b/src/apps/couch/src/couch.erl
index 8526e68..4b2032a 100644
--- a/src/apps/couch/src/couch.erl
+++ b/src/apps/couch/src/couch.erl
@@ -43,7 +43,6 @@ release_version() ->
end.
start() ->
- application:load(couch),
couch_util:start_app_deps(couch),
application:start(couch).
http://git-wip-us.apache.org/repos/asf/couchdb/blob/5a865ac6/src/apps/couch/src/couch_util.erl
----------------------------------------------------------------------
diff --git a/src/apps/couch/src/couch_util.erl b/src/apps/couch/src/couch_util.erl
index 76a9293..f4d66ef 100644
--- a/src/apps/couch/src/couch_util.erl
+++ b/src/apps/couch/src/couch_util.erl
@@ -40,6 +40,7 @@
%% @spec start_app_deps(App :: atom()) -> ok
%% @doc Start depedent applications of App.
start_app_deps(App) ->
+ application:load(App),
{ok, DepApps} = application:get_key(App, applications),
[ensure_started(A) || A <- DepApps],
ok.
http://git-wip-us.apache.org/repos/asf/couchdb/blob/5a865ac6/src/apps/couch_replicator/src/couch_replicator_sup.erl
----------------------------------------------------------------------
diff --git a/src/apps/couch_replicator/src/couch_replicator_sup.erl b/src/apps/couch_replicator/src/couch_replicator_sup.erl
index 905e2cf..7ae5367 100644
--- a/src/apps/couch_replicator/src/couch_replicator_sup.erl
+++ b/src/apps/couch_replicator/src/couch_replicator_sup.erl
@@ -17,6 +17,7 @@
%% API
-export([start_link/0]).
+-export([stop/0]).
%% Supervisor callbacks
-export([init/1]).
@@ -31,6 +32,9 @@
start_link() ->
supervisor:start_link({local, ?MODULE}, ?MODULE, []).
+stop() ->
+ catch exit(whereis(couch_replicator_sup), normal).
+
%% ===================================================================
%% Supervisor callbacks
%% ===================================================================
@@ -56,4 +60,4 @@ init([]) ->
supervisor,
[couch_replicator_manager_sup]}
],
- {ok, { {one_for_one, 10, 3600}, Children} }.
+ {ok, { {one_for_one, 100, 3600}, Children} }.
http://git-wip-us.apache.org/repos/asf/couchdb/blob/5a865ac6/src/apps/couch_replicator/test/03-replication-compact.t
----------------------------------------------------------------------
diff --git a/src/apps/couch_replicator/test/03-replication-compact.t b/src/apps/couch_replicator/test/03-replication-compact.t
index 3e52b37..801b173 100755
--- a/src/apps/couch_replicator/test/03-replication-compact.t
+++ b/src/apps/couch_replicator/test/03-replication-compact.t
@@ -119,8 +119,11 @@ test() ->
delete_db(SourceDb),
delete_db(TargetDb),
couch_server_sup:stop(),
+ couch_replicator_sup:stop(),
+
ok = timer:sleep(1000),
- couch_server_sup:start_link(test_util:config_files())
+ couch_server_sup:start_link(test_util:config_files()),
+ couch_replicator_sup:start_link()
end,
Pairs),
http://git-wip-us.apache.org/repos/asf/couchdb/blob/5a865ac6/src/test/etap/021-btree-reductions.t
----------------------------------------------------------------------
diff --git a/src/test/etap/021-btree-reductions.t b/src/test/etap/021-btree-reductions.t
index e402c30..e12ea6f 100755
--- a/src/test/etap/021-btree-reductions.t
+++ b/src/test/etap/021-btree-reductions.t
@@ -14,7 +14,7 @@
% License for the specific language governing permissions and limitations under
% the License.
-filename() -> "./test/etap/temp.021".
+filename() -> test_util:build_file("test/etap/temp.021").
rows() -> 1000.
main(_) ->
http://git-wip-us.apache.org/repos/asf/couchdb/blob/5a865ac6/src/test/etap/042-work-queue.t
----------------------------------------------------------------------
diff --git a/src/test/etap/042-work-queue.t b/src/test/etap/042-work-queue.t
index 42bcbab..bf480c7 100755
--- a/src/test/etap/042-work-queue.t
+++ b/src/test/etap/042-work-queue.t
@@ -497,6 +497,6 @@ stop(Pid, Name) ->
receive
{ok, Ref} ->
etap:diag("Stopped " ++ Name)
- after 3000 ->
+ after 4000 ->
etap:bail("Timeout stopping " ++ Name)
end.
http://git-wip-us.apache.org/repos/asf/couchdb/blob/5a865ac6/src/test/etap/050-stream.t
----------------------------------------------------------------------
diff --git a/src/test/etap/050-stream.t b/src/test/etap/050-stream.t
index 956e961..c448ed6 100755
--- a/src/test/etap/050-stream.t
+++ b/src/test/etap/050-stream.t
@@ -31,7 +31,8 @@ read_all(Fd, PosList) ->
iolist_to_binary(Data).
test() ->
- {ok, Fd} = couch_file:open("test/etap/temp.050", [create,overwrite]),
+ {ok, Fd} = couch_file:open(test_util:build_file("test/etap/temp.050"),
+ [create,overwrite]),
{ok, Stream} = couch_stream:open(Fd),
etap:is(ok, couch_stream:write(Stream, <<"food">>),
http://git-wip-us.apache.org/repos/asf/couchdb/blob/5a865ac6/src/test/etap/073-changes.t
----------------------------------------------------------------------
diff --git a/src/test/etap/073-changes.t b/src/test/etap/073-changes.t
index fa6dd4f..da90cff 100755
--- a/src/test/etap/073-changes.t
+++ b/src/test/etap/073-changes.t
@@ -427,7 +427,7 @@ stop(Consumer) ->
receive
{ok, Ref} ->
ok
- after 3000 ->
+ after 4000 ->
etap:bail("Timeout stopping consumer")
end.
http://git-wip-us.apache.org/repos/asf/couchdb/blob/5a865ac6/src/test/etap/150-invalid-view-seq.t
----------------------------------------------------------------------
diff --git a/src/test/etap/150-invalid-view-seq.t b/src/test/etap/150-invalid-view-seq.t
index ef0bd9a..b6001f6 100755
--- a/src/test/etap/150-invalid-view-seq.t
+++ b/src/test/etap/150-invalid-view-seq.t
@@ -41,7 +41,8 @@ main(_) ->
%%
test() ->
couch_server_sup:start_link(test_util:config_files()),
- couch_index_sup:start_link(),
+ {ok, Pid} = couch_index_sup:start_link(),
+ unlink(Pid),
timer:sleep(1000),
delete_db(),
@@ -65,7 +66,7 @@ test() ->
query_view_after_restore_backup(),
delete_db(),
- couch_server_sup:stop(),
+ catch couch_server_sup:stop(),
ok.
admin_user_ctx() ->
http://git-wip-us.apache.org/repos/asf/couchdb/blob/5a865ac6/src/test/etap/200-view-group-no-db-leaks.t
----------------------------------------------------------------------
diff --git a/src/test/etap/200-view-group-no-db-leaks.t b/src/test/etap/200-view-group-no-db-leaks.t
index dddf43b..afaaa8e 100755
--- a/src/test/etap/200-view-group-no-db-leaks.t
+++ b/src/test/etap/200-view-group-no-db-leaks.t
@@ -213,6 +213,7 @@ get_db_ref_counter() ->
Ref.
check_db_ref_count() ->
+ timer:sleep(100),
{ok, #db{fd_ref_counter = Ref} = Db} = couch_db:open_int(test_db_name(), []),
ok = couch_db:close(Db),
etap:is(couch_ref_counter:count(Ref), 2,
http://git-wip-us.apache.org/repos/asf/couchdb/blob/5a865ac6/src/test/etap/test_util.erl
----------------------------------------------------------------------
diff --git a/src/test/etap/test_util.erl b/src/test/etap/test_util.erl
index 7bedfd6..0397b4b 100644
--- a/src/test/etap/test_util.erl
+++ b/src/test/etap/test_util.erl
@@ -17,13 +17,11 @@
-export([run/2]).
-export([request/3, request/4]).
+
builddir() ->
Current = filename:dirname(code:which(?MODULE)),
filename:absname(filename:join([Current, "..", ".."])).
-
-
-
srcdir() ->
filename:join([builddir(), "apps"]).