You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by da...@apache.org on 2014/02/06 17:54:32 UTC

[13/22] couch-mrview commit: updated refs/heads/import-rcouch to 7258945

add `make test` target . all erlang test pass

note: from time to time there is a timing issue on 200- test that need
to be fixed. It is most probably due to the way the indexer is
supervised.


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

Branch: refs/heads/import-rcouch
Commit: 2de6fb493ea0c383f217b1d7ffa29e864a76e2fc
Parents: bfd7b43
Author: benoitc <be...@apache.org>
Authored: Thu Jan 9 16:24:32 2014 +0100
Committer: Paul J. Davis <pa...@gmail.com>
Committed: Thu Feb 6 10:51:40 2014 -0600

----------------------------------------------------------------------
 test/01-load.t         | 1 +
 test/02-map-views.t    | 2 ++
 test/03-red-views.t    | 3 +++
 test/04-index-info.t   | 2 ++
 test/05-collation.t    | 3 +++
 test/06-all-docs.t     | 2 ++
 test/07-compact-swap.t | 8 ++++++--
 7 files changed, 19 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb-couch-mrview/blob/2de6fb49/test/01-load.t
----------------------------------------------------------------------
diff --git a/test/01-load.t b/test/01-load.t
index a57c1a7..ae66525 100644
--- a/test/01-load.t
+++ b/test/01-load.t
@@ -1,5 +1,6 @@
 #!/usr/bin/env escript
 %% -*- erlang -*-
+%%! -pa ./src/deps/*/ebin -pa ./src/apps/*/ebin -pa ./src/test/etap
 
 % Licensed under the Apache License, Version 2.0 (the "License"); you may not
 % use this file except in compliance with the License. You may obtain a copy of

http://git-wip-us.apache.org/repos/asf/couchdb-couch-mrview/blob/2de6fb49/test/02-map-views.t
----------------------------------------------------------------------
diff --git a/test/02-map-views.t b/test/02-map-views.t
index 7e1ca0c..ed1b1cc 100644
--- a/test/02-map-views.t
+++ b/test/02-map-views.t
@@ -1,5 +1,6 @@
 #!/usr/bin/env escript
 %% -*- erlang -*-
+%%! -pa ./src/deps/*/ebin -pa ./src/apps/*/ebin -pa ./src/test/etap
 
 % Licensed under the Apache License, Version 2.0 (the "License"); you may not
 % use this file except in compliance with the License. You may obtain a copy of
@@ -29,6 +30,7 @@ main(_) ->
 
 test() ->
     couch_server_sup:start_link(test_util:config_files()),
+    couch_index_sup:start_link(),
 
     {ok, Db} = couch_mrview_test_util:init_db(<<"foo">>, map),
 

http://git-wip-us.apache.org/repos/asf/couchdb-couch-mrview/blob/2de6fb49/test/03-red-views.t
----------------------------------------------------------------------
diff --git a/test/03-red-views.t b/test/03-red-views.t
index 6ad341b..17b9148 100644
--- a/test/03-red-views.t
+++ b/test/03-red-views.t
@@ -1,5 +1,7 @@
 #!/usr/bin/env escript
 %% -*- erlang -*-
+%%! -pa ./src/deps/*/ebin -pa ./src/apps/*/ebin -pa ./src/test/etap
+
 
 % Licensed under the Apache License, Version 2.0 (the "License"); you may not
 % use this file except in compliance with the License. You may obtain a copy of
@@ -18,6 +20,7 @@ main(_) ->
 
 test() ->
     couch_server_sup:start_link(test_util:config_files()),
+    couch_index_sup:start_link(),
 
     {ok, Db} = couch_mrview_test_util:init_db(<<"foo">>, red),
 

http://git-wip-us.apache.org/repos/asf/couchdb-couch-mrview/blob/2de6fb49/test/04-index-info.t
----------------------------------------------------------------------
diff --git a/test/04-index-info.t b/test/04-index-info.t
index 6b67b56..73c4dcc 100644
--- a/test/04-index-info.t
+++ b/test/04-index-info.t
@@ -1,5 +1,6 @@
 #!/usr/bin/env escript
 %% -*- erlang -*-
+%%! -pa ./src/deps/*/ebin -pa ./src/apps/*/ebin -pa ./src/test/etap
 
 % Licensed under the Apache License, Version 2.0 (the "License"); you may not
 % use this file except in compliance with the License. You may obtain a copy of
@@ -31,6 +32,7 @@ sig() -> <<"276df562b152b3c4e5d34024f62672ed">>.
 
 test() ->
     couch_server_sup:start_link(test_util:config_files()),
+    couch_index_sup:start_link(),
 
     {ok, Db} = couch_mrview_test_util:init_db(<<"foo">>, map),
     couch_mrview:query_view(Db, <<"_design/bar">>, <<"baz">>),

http://git-wip-us.apache.org/repos/asf/couchdb-couch-mrview/blob/2de6fb49/test/05-collation.t
----------------------------------------------------------------------
diff --git a/test/05-collation.t b/test/05-collation.t
index ac8f8bc..d476601 100644
--- a/test/05-collation.t
+++ b/test/05-collation.t
@@ -1,5 +1,6 @@
 #!/usr/bin/env escript
 %% -*- erlang -*-
+%%! -pa ./src/deps/*/ebin -pa ./src/apps/*/ebin -pa ./src/test/etap
 
 % Licensed under the Apache License, Version 2.0 (the "License"); you may not
 % use this file except in compliance with the License. You may obtain a copy of
@@ -19,6 +20,8 @@ main(_) ->
 
 test() ->
     couch_server_sup:start_link(test_util:config_files()),
+    couch_index_sup:start_link(),
+
     {ok, Db0} = couch_mrview_test_util:new_db(<<"foo">>, map),
     {ok, Db1} = couch_mrview_test_util:save_docs(Db0, docs()),
 

http://git-wip-us.apache.org/repos/asf/couchdb-couch-mrview/blob/2de6fb49/test/06-all-docs.t
----------------------------------------------------------------------
diff --git a/test/06-all-docs.t b/test/06-all-docs.t
index 4501aa5..a19cd7e 100644
--- a/test/06-all-docs.t
+++ b/test/06-all-docs.t
@@ -1,5 +1,6 @@
 #!/usr/bin/env escript
 %% -*- erlang -*-
+%%! -pa ./src/deps/*/ebin -pa ./src/apps/*/ebin -pa ./src/test/etap
 
 % Licensed under the Apache License, Version 2.0 (the "License"); you may not
 % use this file except in compliance with the License. You may obtain a copy of
@@ -19,6 +20,7 @@ main(_) ->
 
 test() ->
     couch_server_sup:start_link(test_util:config_files()),
+    couch_index_sup:start_link(),
 
     {ok, Db} = couch_mrview_test_util:init_db(<<"foo">>, map),
 

http://git-wip-us.apache.org/repos/asf/couchdb-couch-mrview/blob/2de6fb49/test/07-compact-swap.t
----------------------------------------------------------------------
diff --git a/test/07-compact-swap.t b/test/07-compact-swap.t
index 4bfe124..a74d273 100644
--- a/test/07-compact-swap.t
+++ b/test/07-compact-swap.t
@@ -1,5 +1,7 @@
 #!/usr/bin/env escript
 %% -*- erlang -*-
+%%! -pa ./src/deps/*/ebin -pa ./src/apps/*/ebin -pa ./src/test/etap
+
 
 % Licensed under the Apache License, Version 2.0 (the "License"); you may not
 % use this file except in compliance with the License. You may obtain a copy of
@@ -19,6 +21,8 @@ main(_) ->
 
 test() ->
     couch_server_sup:start_link(test_util:config_files()),
+    couch_index_sup:start_link(),
+
     {ok, Db} = couch_mrview_test_util:init_db(<<"foo">>, map, 1000),
     couch_mrview:query_view(Db, <<"_design/bar">>, <<"baz">>),
     test_swap(Db),
@@ -26,7 +30,7 @@ test() ->
 
 
 test_swap(Db) ->
-    {ok, QPid} = start_query(Db),    
+    {ok, QPid} = start_query(Db),
     {ok, MonRef} = couch_mrview:compact(Db, <<"_design/bar">>, [monitor]),
     receive
         {'DOWN', MonRef, process, _, _} -> ok
@@ -50,7 +54,7 @@ start_query(Db) ->
             ({row, _}, Count) -> {ok, Count+1};
             (_, Count) -> {ok, Count}
         end,
-        {ok, Result} = 
+        {ok, Result} =
         couch_mrview:query_view(Db, <<"_design/bar">>, <<"baz">>, [], CB, wait),
         Self ! {self(), Result}
     end),