From aefb1018a627f917bdf1d3336cf3760a87b4e100 Mon Sep 17 00:00:00 2001 From: Albert Schimpf Date: Mon, 4 Nov 2019 12:59:43 +0100 Subject: [PATCH] Added kernel network config for documentation purposes. Removed eunit_opts. Verbose output is worse than default output, as it doesn't show failures at the end. Eunit_logs is not useful. Added eunit.coverdata to coverage stats. Silenced added test case --- Makefile | 1 - config/network.config | 6 ++++++ rebar.config | 4 +--- src/antidote_app.erl | 3 +++ 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index d5612285e..0dde6da28 100644 --- a/Makefile +++ b/Makefile @@ -54,7 +54,6 @@ compile-utils: compile done test: - mkdir -p eunit_logs ${REBAR} eunit skip_deps=true coverage: diff --git a/config/network.config b/config/network.config index 68809988a..8e600606d 100644 --- a/config/network.config +++ b/config/network.config @@ -20,4 +20,10 @@ {antidote_stats, [ {metrics_port, 3001} ]} + +%% possible to restrict distributed Erlang ports +%% {kernel, [ +%% {inet_dist_listen_min, 9100}, +%% {inet_dist_listen_max, 9100} +%% ]} ]. diff --git a/rebar.config b/rebar.config index 5939a796c..5f521720b 100644 --- a/rebar.config +++ b/rebar.config @@ -28,8 +28,6 @@ ]}. -{eunit_opts, [verbose, {report, {eunit_surefire, [{dir, "eunit_logs/"}]}}]}. - {dialyzer, [{warnings, [ error_handling, race_conditions, @@ -173,5 +171,5 @@ {cover_enabled, true}. {cover_export_enabled, true}. -{coveralls_coverdata, "logs/*/all.coverdata"}. +{coveralls_coverdata, ["logs/*/all.coverdata", "_build/test/cover/eunit.coverdata"]}. {coveralls_service_name, "travis-ci"}. diff --git a/src/antidote_app.erl b/src/antidote_app.erl index ef03f2897..5bf5cfda7 100644 --- a/src/antidote_app.erl +++ b/src/antidote_app.erl @@ -99,8 +99,11 @@ stop(_State) -> %% Throw error if data dir is a file data_dir_is_a_file_test() -> + {ok, Level} = maps:find(level, logger:get_primary_config()), + logger:set_primary_config(level, emergency), application:set_env(antidote, data_dir, "tmpfile"), ok = file:write_file("tmpfile", <<"hello">>), {error, invalid_data_dir} = (catch validate_data_dir()), + logger:set_primary_config(level, Level), ok = file:delete("tmpfile"). -endif.