diff options
Diffstat (limited to 'src/couch/test/eunit/couch_server_tests.erl')
| -rw-r--r-- | src/couch/test/eunit/couch_server_tests.erl | 52 |
1 files changed, 24 insertions, 28 deletions
diff --git a/src/couch/test/eunit/couch_server_tests.erl b/src/couch/test/eunit/couch_server_tests.erl index 66533d48c..a43106d89 100644 --- a/src/couch/test/eunit/couch_server_tests.erl +++ b/src/couch/test/eunit/couch_server_tests.erl @@ -45,13 +45,13 @@ teardown(rename, Db) -> teardown(_, Db) -> teardown(Db). - delete_db_test_() -> { "Test for proper deletion of db file", { setup, - fun start/0, fun test_util:stop/1, + fun start/0, + fun test_util:stop/1, [ make_test_case(rename, [fun should_rename_on_delete/2]), make_test_case(delete, [fun should_delete/2]) @@ -76,7 +76,8 @@ should_rename_on_delete(_, Db) -> ?assertMatch([_], DeletedFiles), [Renamed] = DeletedFiles, ?assertEqual( - filename:extension(Origin), filename:extension(Renamed)), + filename:extension(Origin), filename:extension(Renamed) + ), ?assert(filelib:is_regular(Renamed)) end). @@ -93,7 +94,6 @@ should_delete(_, Db) -> deleted_files(ViewFile) -> filelib:wildcard(filename:rootname(ViewFile) ++ "*.deleted.*"). - bad_engine_option_test_() -> { setup, @@ -104,19 +104,19 @@ bad_engine_option_test_() -> ] }. - t_bad_engine_option() -> Resp = couch_server:create(?tempdb(), [{engine, <<"cowabunga!">>}]), ?assertEqual(Resp, {error, {invalid_engine_extension, <<"cowabunga!">>}}). - get_engine_path_test_() -> { setup, - fun start/0, fun test_util:stop/1, + fun start/0, + fun test_util:stop/1, { foreach, - fun setup/0, fun teardown/1, + fun setup/0, + fun teardown/1, [ fun should_return_engine_path/1, fun should_return_invalid_engine_error/1 @@ -124,7 +124,6 @@ get_engine_path_test_() -> } }. - should_return_engine_path(Db) -> DbName = couch_db:name(Db), Engine = couch_db_engine:get_engine(Db), @@ -132,14 +131,12 @@ should_return_engine_path(Db) -> FilePath = couch_db:get_filepath(Db), ?_assertMatch({ok, FilePath}, Resp). - should_return_invalid_engine_error(Db) -> DbName = couch_db:name(Db), Engine = fake_engine, Resp = couch_server:get_engine_path(DbName, Engine), ?_assertMatch({error, {invalid_engine, Engine}}, Resp). - interleaved_requests_test_() -> { setup, @@ -148,7 +145,6 @@ interleaved_requests_test_() -> fun make_interleaved_requests/1 }. - start_interleaved() -> TestDbName = ?tempdb(), meck:new(couch_db, [passthrough]), @@ -180,19 +176,16 @@ start_interleaved() -> end), {test_util:start_couch(), TestDbName}. - stop_interleaved({Ctx, TestDbName}) -> couch_server:delete(TestDbName, [?ADMIN_CTX]), meck:unload(), test_util:stop_couch(Ctx). - make_interleaved_requests({_, TestDbName}) -> [ fun() -> t_interleaved_create_delete_open(TestDbName) end ]. - t_interleaved_create_delete_open(DbName) -> {CrtRef, OpenRef} = {make_ref(), make_ref()}, CrtMsg = {'$gen_call', {self(), CrtRef}, {create, DbName, [?ADMIN_CTX]}}, @@ -247,7 +240,6 @@ t_interleaved_create_delete_open(DbName) -> ?assert(is_process_alive(CouchServer)), check_monitor_not_triggered(CSRef). - get_opener_pid(DbName) -> WaitFun = fun() -> case ets:lookup(couch_server:couch_dbs(DbName), DbName) of @@ -259,23 +251,28 @@ get_opener_pid(DbName) -> end, test_util:wait(WaitFun). - wait_for_open_async_result(CouchServer, Opener) -> WaitFun = fun() -> {_, Messages} = erlang:process_info(CouchServer, messages), - Found = lists:foldl(fun(Msg, Acc) -> - case Msg of - {'$gen_call', {Opener, _}, {open_result, _, {ok, _}}} -> - true; - _ -> - Acc - end - end, false, Messages), - if Found -> ok; true -> wait end + Found = lists:foldl( + fun(Msg, Acc) -> + case Msg of + {'$gen_call', {Opener, _}, {open_result, _, {ok, _}}} -> + true; + _ -> + Acc + end + end, + false, + Messages + ), + if + Found -> ok; + true -> wait + end end, test_util:wait(WaitFun). - check_monitor_not_triggered(Ref) -> receive {'DOWN', Ref, _, _, Reason0} -> @@ -284,7 +281,6 @@ check_monitor_not_triggered(Ref) -> ok end. - get_next_message() -> receive Msg -> |