couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rnew...@apache.org
Subject [46/50] [abbrv] git commit: updated refs/heads/1843-feature-bigcouch to cba2e81
Date Sat, 29 Jun 2013 15:18:27 GMT
[squash] update etap tests


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

Branch: refs/heads/1843-feature-bigcouch
Commit: 66a52955fd697e251647c63064b11c34ef7574a7
Parents: 86ba6db
Author: Paul J. Davis <paul.joseph.davis@gmail.com>
Authored: Thu Mar 14 01:43:39 2013 -0500
Committer: Paul J. Davis <paul.joseph.davis@gmail.com>
Committed: Wed Mar 20 06:02:57 2013 -0500

----------------------------------------------------------------------
 src/couch_mrview/test/02-map-views.t    | 15 ++-------------
 src/couch_mrview/test/03-red-views.t    |  2 +-
 src/couch_mrview/test/04-index-info.t   | 15 ++-------------
 src/couch_mrview/test/05-collation.t    |  3 ++-
 src/couch_mrview/test/06-all-docs.t     |  2 +-
 src/couch_mrview/test/07-compact-swap.t |  2 +-
 6 files changed, 9 insertions(+), 30 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb/blob/66a52955/src/couch_mrview/test/02-map-views.t
----------------------------------------------------------------------
diff --git a/src/couch_mrview/test/02-map-views.t b/src/couch_mrview/test/02-map-views.t
index 7e1ca0c..bcf4ce1 100644
--- a/src/couch_mrview/test/02-map-views.t
+++ b/src/couch_mrview/test/02-map-views.t
@@ -14,21 +14,10 @@
 % the License.
 
 main(_) ->
-    test_util:init_code_path(),
-
-    etap:plan(6),
-    case (catch test()) of
-        ok ->
-            etap:end_tests();
-        Other ->
-            etap:diag(io_lib:format("Test died abnormally: ~p", [Other])),
-            etap:bail(Other)
-    end,
-    timer:sleep(300),
-    ok.
+    test_util:run(6, fun() -> test() end).
 
 test() ->
-    couch_server_sup:start_link(test_util:config_files()),
+    test_util:start_couch(),
 
     {ok, Db} = couch_mrview_test_util:init_db(<<"foo">>, map),
 

http://git-wip-us.apache.org/repos/asf/couchdb/blob/66a52955/src/couch_mrview/test/03-red-views.t
----------------------------------------------------------------------
diff --git a/src/couch_mrview/test/03-red-views.t b/src/couch_mrview/test/03-red-views.t
index 6ad341b..0d11d51 100644
--- a/src/couch_mrview/test/03-red-views.t
+++ b/src/couch_mrview/test/03-red-views.t
@@ -17,7 +17,7 @@ main(_) ->
     test_util:run(4, fun() -> test() end).
 
 test() ->
-    couch_server_sup:start_link(test_util:config_files()),
+    test_util:start_couch(),
 
     {ok, Db} = couch_mrview_test_util:init_db(<<"foo">>, red),
 

http://git-wip-us.apache.org/repos/asf/couchdb/blob/66a52955/src/couch_mrview/test/04-index-info.t
----------------------------------------------------------------------
diff --git a/src/couch_mrview/test/04-index-info.t b/src/couch_mrview/test/04-index-info.t
index 6b67b56..c86b168 100644
--- a/src/couch_mrview/test/04-index-info.t
+++ b/src/couch_mrview/test/04-index-info.t
@@ -14,23 +14,12 @@
 % the License.
 
 main(_) ->
-    test_util:init_code_path(),
-
-    etap:plan(9),
-    case (catch test()) of
-        ok ->
-            etap:end_tests();
-        Other ->
-            etap:diag(io_lib:format("Test died abnormally: ~p", [Other])),
-            etap:bail(Other)
-    end,
-    timer:sleep(300),
-    ok.
+    test_util:run(9, fun() -> test() end).
 
 sig() -> <<"276df562b152b3c4e5d34024f62672ed">>.
 
 test() ->
-    couch_server_sup:start_link(test_util:config_files()),
+    test_util:start_couch(),
 
     {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/blob/66a52955/src/couch_mrview/test/05-collation.t
----------------------------------------------------------------------
diff --git a/src/couch_mrview/test/05-collation.t b/src/couch_mrview/test/05-collation.t
index ac8f8bc..09878af 100644
--- a/src/couch_mrview/test/05-collation.t
+++ b/src/couch_mrview/test/05-collation.t
@@ -18,7 +18,8 @@ main(_) ->
 
 
 test() ->
-    couch_server_sup:start_link(test_util:config_files()),
+    test_util:start_couch(),
+
     {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/blob/66a52955/src/couch_mrview/test/06-all-docs.t
----------------------------------------------------------------------
diff --git a/src/couch_mrview/test/06-all-docs.t b/src/couch_mrview/test/06-all-docs.t
index 4501aa5..a3aafa0 100644
--- a/src/couch_mrview/test/06-all-docs.t
+++ b/src/couch_mrview/test/06-all-docs.t
@@ -18,7 +18,7 @@ main(_) ->
 
 
 test() ->
-    couch_server_sup:start_link(test_util:config_files()),
+    test_util:start_couch(),
 
     {ok, Db} = couch_mrview_test_util:init_db(<<"foo">>, map),
 

http://git-wip-us.apache.org/repos/asf/couchdb/blob/66a52955/src/couch_mrview/test/07-compact-swap.t
----------------------------------------------------------------------
diff --git a/src/couch_mrview/test/07-compact-swap.t b/src/couch_mrview/test/07-compact-swap.t
index 4bfe124..c1fd043 100644
--- a/src/couch_mrview/test/07-compact-swap.t
+++ b/src/couch_mrview/test/07-compact-swap.t
@@ -18,7 +18,7 @@ main(_) ->
 
 
 test() ->
-    couch_server_sup:start_link(test_util:config_files()),
+    test_util:start_couch(),
     {ok, Db} = couch_mrview_test_util:init_db(<<"foo">>, map, 1000),
     couch_mrview:query_view(Db, <<"_design/bar">>, <<"baz">>),
     test_swap(Db),


Mime
View raw message