This is an automated email from the ASF dual-hosted git repository. vatamane pushed a commit to branch refactor-replication-tests in repository https://gitbox.apache.org/repos/asf/couchdb.git
commit 4765b097a3d992210c59d43ec2fff0708a9787f2 Author: Nick Vatamaniuc <[email protected]> AuthorDate: Thu Aug 18 21:22:30 2022 -0400 Update couch_replicator_httpc_pool_tests Use the TDEF_FE macro and remove the ?_test(begin...end) construct. --- .../eunit/couch_replicator_httpc_pool_tests.erl | 96 +++++++++++----------- 1 file changed, 46 insertions(+), 50 deletions(-) diff --git a/src/couch_replicator/test/eunit/couch_replicator_httpc_pool_tests.erl b/src/couch_replicator/test/eunit/couch_replicator_httpc_pool_tests.erl index 31f1da48e..5fce5e886 100644 --- a/src/couch_replicator/test/eunit/couch_replicator_httpc_pool_tests.erl +++ b/src/couch_replicator/test/eunit/couch_replicator_httpc_pool_tests.erl @@ -13,7 +13,7 @@ -module(couch_replicator_httpc_pool_tests). -include_lib("couch/include/couch_eunit.hrl"). --include_lib("couch/include/couch_db.hrl"). +-include("couch_replicator_test.hrl"). -define(TIMEOUT, 1000). @@ -35,71 +35,67 @@ httpc_pool_test_() -> fun setup/0, fun teardown/1, [ - fun should_block_new_clients_when_full/1, - fun should_replace_worker_on_death/1 + ?TDEF_FE(should_block_new_clients_when_full), + ?TDEF_FE(should_replace_worker_on_death) ] } } }. should_block_new_clients_when_full(Pool) -> - ?_test(begin - Client1 = spawn_client(Pool), - Client2 = spawn_client(Pool), - Client3 = spawn_client(Pool), + Client1 = spawn_client(Pool), + Client2 = spawn_client(Pool), + Client3 = spawn_client(Pool), - ?assertEqual(ok, ping_client(Client1)), - ?assertEqual(ok, ping_client(Client2)), - ?assertEqual(ok, ping_client(Client3)), + ?assertEqual(ok, ping_client(Client1)), + ?assertEqual(ok, ping_client(Client2)), + ?assertEqual(ok, ping_client(Client3)), - Worker1 = get_client_worker(Client1, "1"), - Worker2 = get_client_worker(Client2, "2"), - Worker3 = get_client_worker(Client3, "3"), + Worker1 = get_client_worker(Client1, "1"), + Worker2 = get_client_worker(Client2, "2"), + Worker3 = get_client_worker(Client3, "3"), - ?assert(is_process_alive(Worker1)), - ?assert(is_process_alive(Worker2)), - ?assert(is_process_alive(Worker3)), + ?assert(is_process_alive(Worker1)), + ?assert(is_process_alive(Worker2)), + ?assert(is_process_alive(Worker3)), - ?assertNotEqual(Worker1, Worker2), - ?assertNotEqual(Worker2, Worker3), - ?assertNotEqual(Worker3, Worker1), + ?assertNotEqual(Worker1, Worker2), + ?assertNotEqual(Worker2, Worker3), + ?assertNotEqual(Worker3, Worker1), - Client4 = spawn_client(Pool), - ?assertEqual(timeout, ping_client(Client4)), + Client4 = spawn_client(Pool), + ?assertEqual(timeout, ping_client(Client4)), - ?assertEqual(ok, stop_client(Client1)), - ?assertEqual(ok, ping_client(Client4)), + ?assertEqual(ok, stop_client(Client1)), + ?assertEqual(ok, ping_client(Client4)), - Worker4 = get_client_worker(Client4, "4"), - ?assertEqual(Worker1, Worker4), + Worker4 = get_client_worker(Client4, "4"), + ?assertEqual(Worker1, Worker4), - lists:foreach( - fun(C) -> - ?assertEqual(ok, stop_client(C)) - end, - [Client2, Client3, Client4] - ) - end). + lists:foreach( + fun(C) -> + ?assertEqual(ok, stop_client(C)) + end, + [Client2, Client3, Client4] + ). should_replace_worker_on_death(Pool) -> - ?_test(begin - Client1 = spawn_client(Pool), - ?assertEqual(ok, ping_client(Client1)), - Worker1 = get_client_worker(Client1, "1"), - ?assert(is_process_alive(Worker1)), - - ?assertEqual(ok, kill_client_worker(Client1)), - ?assertNot(is_process_alive(Worker1)), - ?assertEqual(ok, stop_client(Client1)), - - Client2 = spawn_client(Pool), - ?assertEqual(ok, ping_client(Client2)), - Worker2 = get_client_worker(Client2, "2"), - ?assert(is_process_alive(Worker2)), - - ?assertNotEqual(Worker1, Worker2), - ?assertEqual(ok, stop_client(Client2)) - end). + Client1 = spawn_client(Pool), + ?assertEqual(ok, ping_client(Client1)), + Worker1 = get_client_worker(Client1, "1"), + ?assert(is_process_alive(Worker1)), + + ?assertEqual(ok, kill_client_worker(Client1)), + ?assertNot(is_process_alive(Worker1)), + ?assertEqual(ok, stop_client(Client1)), + + Client2 = spawn_client(Pool), + ?assertEqual(ok, ping_client(Client2)), + Worker2 = get_client_worker(Client2, "2"), + ?assert(is_process_alive(Worker2)), + + ?assertNotEqual(Worker1, Worker2), + ?assertEqual(ok, stop_client(Client2)). spawn_client(Pool) -> Parent = self(),
