iilyak commented on a change in pull request #3923:
URL: https://github.com/apache/couchdb/pull/3923#discussion_r799609153
##########
File path: src/chttpd/test/eunit/chttpd_dbs_info_test.erl
##########
@@ -14,358 +14,263 @@
-include_lib("couch/include/couch_eunit.hrl").
-include_lib("couch/include/couch_db.hrl").
+-include("chttpd_test.hrl").
-define(USER, "chttpd_db_test_admin").
-define(PASS, "pass").
-define(AUTH, {basic_auth, {?USER, ?PASS}}).
-define(CONTENT_JSON, {"Content-Type", "application/json"}).
+start() ->
+ Ctx = chttpd_test_util:start_couch(),
+ DbDir = config:get("couchdb", "database_dir"),
+ Suffix = ?b2l(couch_uuids:random()),
+ test_util:with_couch_server_restart(fun() ->
+ config:set("couchdb", "database_dir", DbDir ++ "/" ++ Suffix, false)
+ end),
+ mock([fabric_util, chttpd_util]),
+ Ctx.
+
+stop(Ctx) ->
+ config:delete("couchdb", "database_dir", false),
+ chttpd_test_util:stop_couch(Ctx).
+
setup() ->
Hashed = couch_passwords:hash_admin_password(?PASS),
ok = config:set("admins", ?USER, ?b2l(Hashed), _Persist = false),
- Addr = config:get("chttpd", "bind_address", "127.0.0.1"),
- Port = mochiweb_socket_server:get(chttpd, port),
- Url = lists:concat(["http://";, Addr, ":", Port, "/"]),
- Db1Url = lists:concat([Url, "db1"]),
- create_db(Db1Url),
- Db2Url = lists:concat([Url, "db2"]),
- create_db(Db2Url),
- mock(fabric_util),
- mock(chttpd_util),
- Url.
-
-teardown(Url) ->
+ Suffix = ?b2l(couch_uuids:random()),
+ Db1 = testdb("db1", Suffix),
+ Db2 = testdb("db2", Suffix),
+ create_db(base_url(Db1)),
+ create_db(base_url(Db2)),
+ {Suffix, Db1, Db2}.
+
+teardown({_, Db1, Db2}) ->
meck:unload(),
- Db1Url = lists:concat([Url, "db1"]),
- Db2Url = lists:concat([Url, "db2"]),
- delete_db(Db1Url),
- delete_db(Db2Url),
+ delete_db(base_url(Db1)),
+ delete_db(base_url(Db2)),
ok = config:delete("admins", ?USER, _Persist = false).
-create_db(Url) ->
- {ok, Status, _, _} = test_request:put(Url, [?CONTENT_JSON, ?AUTH], "{}"),
- ?assert(Status =:= 201 orelse Status =:= 202).
-
-delete_db(Url) ->
- {ok, 200, _, _} = test_request:delete(Url, [?AUTH]).
-
-mock(Module) ->
- meck:new(Module, [passthrough]).
-
-mock_timeout() ->
- meck:expect(fabric_util, request_timeout, fun() -> 0 end).
-
-mock_db_not_exist() ->
- meck:expect(
- chttpd_util,
- get_db_info,
- fun(_) -> {error, database_does_not_exist} end
- ).
-
dbs_info_test_() ->
{
"chttpd dbs info tests",
{
setup,
- fun chttpd_test_util:start_couch/0,
- fun chttpd_test_util:stop_couch/1,
+ fun start/0,
+ fun stop/1,
{
foreach,
fun setup/0,
fun teardown/1,
[
- fun get_db_info_should_return_db_info/1,
- fun get_db_info_should_return_error_when_db_not_exist/1,
- fun get_db_info_should_return_error_when_time_out/1,
- fun should_return_error_for_put_dbs_info/1,
- fun should_return_dbs_info_for_get_dbs_info/1,
- fun
should_return_nothing_when_db_not_exist_for_get_dbs_info/1,
- fun
should_return_500_time_out_when_time_is_not_enough_for_get_dbs_info/1,
- fun should_return_db2_for_get_dbs_info_with_descending/1,
- fun should_return_db1_for_get_dbs_info_with_limit_1/1,
- fun should_return_db2_for_get_dbs_info_with_skip_1/1,
- fun should_return_dbs_info_with_correct_start_end_key/1,
- fun should_return_empty_list_with_wrong_start_end_key/1,
- fun should_return_dbs_info_for_single_db/1,
- fun should_return_dbs_info_for_multiple_dbs/1,
- fun should_return_error_for_exceeded_keys/1,
- fun should_return_error_for_missing_keys/1,
- fun should_return_dbs_info_for_dbs_with_mixed_state/1
+ ?TDEF_FE(get_db_info_should_return_db_info),
+
?TDEF_FE(get_db_info_should_return_error_when_db_not_exist),
+ ?TDEF_FE(get_db_info_should_return_error_when_time_out),
+ ?TDEF_FE(should_return_error_for_put_dbs_info),
+ ?TDEF_FE(should_return_dbs_info_for_get_dbs_info),
+
?TDEF_FE(should_return_nothing_when_db_not_exist_for_get_dbs_info),
+
?TDEF_FE(should_return_500_time_out_when_time_is_not_enough_for_get_dbs_info),
+
?TDEF_FE(should_return_db2_for_get_dbs_info_with_descending),
+ ?TDEF_FE(should_return_db1_for_get_dbs_info_with_limit_1),
+ ?TDEF_FE(should_return_db2_for_get_dbs_info_with_skip_1),
+
?TDEF_FE(should_return_dbs_info_with_correct_start_end_key),
+
?TDEF_FE(should_return_empty_list_with_wrong_start_end_key),
+ ?TDEF_FE(should_return_dbs_info_for_single_db),
+ ?TDEF_FE(should_return_dbs_info_for_multiple_dbs),
+ ?TDEF_FE(should_return_error_for_exceeded_keys),
+ ?TDEF_FE(should_return_error_for_missing_keys),
+ ?TDEF_FE(should_return_dbs_info_for_dbs_with_mixed_state)
]
}
}
}.
-get_db_info_should_return_db_info(_) ->
- DbInfo = fabric:get_db_info("db1"),
- ?_assertEqual(DbInfo, chttpd_util:get_db_info("db1")).
+get_db_info_should_return_db_info({_, Db1, _}) ->
+ DbInfo = fabric:get_db_info(Db1),
+ ?assertEqual(DbInfo, chttpd_util:get_db_info(Db1)).
get_db_info_should_return_error_when_db_not_exist(_) ->
- ?_assertEqual(
+ ?assertEqual(
{error, database_does_not_exist},
chttpd_util:get_db_info("db_not_exist")
).
-get_db_info_should_return_error_when_time_out(_) ->
- ?_test(
- begin
- mock_timeout(),
- ?assertEqual({error, timeout}, chttpd_util:get_db_info("db1"))
- end
- ).
+get_db_info_should_return_error_when_time_out({_, Db1, _}) ->
+ mock_timeout(),
+ ?assertEqual({error, timeout}, chttpd_util:get_db_info(Db1)).
-should_return_error_for_put_dbs_info(Url) ->
- ?_test(
- begin
- {ok, Code, _, ResultBody} = test_request:put(
- Url ++
- "_dbs_info",
- [?CONTENT_JSON, ?AUTH],
- ""
- ),
- {Body} = jiffy:decode(ResultBody),
- ?assertEqual(405, Code),
- ?assertEqual(
- <<"method_not_allowed">>,
- couch_util:get_value(<<"error">>, Body)
- )
- end
- ).
+should_return_error_for_put_dbs_info(_) ->
+ {ok, Code, _, ResultBody} = test_request:put(
+ dbs_info_url(), [?CONTENT_JSON, ?AUTH], ""
+ ),
+ {Body} = jiffy:decode(ResultBody),
+ ?assertEqual(
+ <<"method_not_allowed">>,
+ couch_util:get_value(<<"error">>, Body)
+ ),
+ ?assertEqual(405, Code).
Review comment:
Thank you for swapping assertions order. It is way easier to debug
failures this way. Because the failed assertion would contain the reason.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
