[squash] update etap tests
diff --git a/test/02-map-views.t b/test/02-map-views.t
index 7e1ca0c..bcf4ce1 100644
--- a/test/02-map-views.t
+++ b/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),
diff --git a/test/03-red-views.t b/test/03-red-views.t
index 6ad341b..0d11d51 100644
--- a/test/03-red-views.t
+++ b/test/03-red-views.t
@@ -17,7 +17,7 @@
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),
diff --git a/test/04-index-info.t b/test/04-index-info.t
index 6b67b56..c86b168 100644
--- a/test/04-index-info.t
+++ b/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">>),
diff --git a/test/05-collation.t b/test/05-collation.t
index ac8f8bc..09878af 100644
--- a/test/05-collation.t
+++ b/test/05-collation.t
@@ -18,7 +18,8 @@
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()),
diff --git a/test/06-all-docs.t b/test/06-all-docs.t
index 4501aa5..a3aafa0 100644
--- a/test/06-all-docs.t
+++ b/test/06-all-docs.t
@@ -18,7 +18,7 @@
test() ->
- couch_server_sup:start_link(test_util:config_files()),
+ test_util:start_couch(),
{ok, Db} = couch_mrview_test_util:init_db(<<"foo">>, map),
diff --git a/test/07-compact-swap.t b/test/07-compact-swap.t
index 4bfe124..c1fd043 100644
--- a/test/07-compact-swap.t
+++ b/test/07-compact-swap.t
@@ -18,7 +18,7 @@
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),
