From 3fc8e0408cd27e15fdfbd3711c6ab18140745c86 Mon Sep 17 00:00:00 2001 From: Tristan Sloughter Date: Sat, 28 Sep 2013 11:56:32 -0500 Subject: warn, not error, on bad app during discovery provider --- test/rlx_release_SUITE.erl | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) (limited to 'test/rlx_release_SUITE.erl') diff --git a/test/rlx_release_SUITE.erl b/test/rlx_release_SUITE.erl index 0684917..7ac95bc 100644 --- a/test/rlx_release_SUITE.erl +++ b/test/rlx_release_SUITE.erl @@ -94,7 +94,7 @@ make_release(Config) -> goal_app_2]}]), OutputDir = filename:join([proplists:get_value(data_dir, Config), create_random_name("relx-output")]), - {ok, State} = relx:do(undefined, undefined, [], [LibDir1], 2, + {ok, State} = relx:do(undefined, undefined, [], [LibDir1], 3, OutputDir, ConfigFile), [{{foo, "0.0.1"}, Release}] = ec_dictionary:to_list(rlx_state:realized_releases(State)), AppSpecs = rlx_release:applications(Release), @@ -130,7 +130,7 @@ make_invalid_config_release(Config) -> OutputDir = filename:join([proplists:get_value(data_dir, Config), create_random_name("relx-output")]), {error, {rlx_prv_config, - {consult, _, _}}} = relx:do(undefined, undefined, [], [LibDir1], 2, + {consult, _, _}}} = relx:do(undefined, undefined, [], [LibDir1], 3, OutputDir, ConfigFile). make_scriptless_release(Config) -> @@ -157,7 +157,7 @@ make_scriptless_release(Config) -> goal_app_2]}]), OutputDir = filename:join([proplists:get_value(data_dir, Config), create_random_name("relx-output")]), - {ok, State} = relx:do(undefined, undefined, [], [LibDir1], 2, + {ok, State} = relx:do(undefined, undefined, [], [LibDir1], 3, OutputDir, ConfigFile), ?assert(not ec_file:exists(filename:join([OutputDir, "bin", "foo"]))), @@ -207,7 +207,7 @@ make_overridden_release(Config) -> OutputDir = filename:join([proplists:get_value(data_dir, Config), create_random_name("relx-output")]), {ok, Cwd} = file:get_cwd(), - {ok, State} = relx:do(Cwd, undefined, undefined, [], [LibDir1], 2, + {ok, State} = relx:do(Cwd, undefined, undefined, [], [LibDir1], 3, OutputDir, [{OverrideAppName, OverrideAppDir}], ConfigFile), [{{foo, "0.0.1"}, Release}] = ec_dictionary:to_list(rlx_state:realized_releases(State)), @@ -248,7 +248,7 @@ make_skip_app_release(Config) -> OutputDir = filename:join([proplists:get_value(data_dir, Config), create_random_name("relx-output")]), {ok, Cwd} = file:get_cwd(), - {ok, State} = relx:do(Cwd, undefined, undefined, [], [LibDir1], 2, + {ok, State} = relx:do(Cwd, undefined, undefined, [], [LibDir1], 3, OutputDir, [], ConfigFile), [{{foo, "0.0.1"}, Release}] = ec_dictionary:to_list(rlx_state:realized_releases(State)), @@ -292,7 +292,7 @@ make_auto_skip_empty_app_release(Config) -> OutputDir = filename:join([proplists:get_value(data_dir, Config), create_random_name("relx-output")]), {ok, Cwd} = file:get_cwd(), - {ok, State} = relx:do(Cwd, undefined, undefined, [], [LibDir1], 2, + {ok, State} = relx:do(Cwd, undefined, undefined, [], [LibDir1], 3, OutputDir, [], ConfigFile), [{{foo, "0.0.1"}, Release}] = ec_dictionary:to_list(rlx_state:realized_releases(State)), @@ -330,7 +330,7 @@ make_app_type_none_release(Config) -> OutputDir = filename:join([proplists:get_value(data_dir, Config), create_random_name("relx-output")]), {ok, Cwd} = file:get_cwd(), - {ok, State} = relx:do(Cwd, undefined, undefined, [], [LibDir1], 2, + {ok, State} = relx:do(Cwd, undefined, undefined, [], [LibDir1], 3, OutputDir, [], ConfigFile), [{{foo, "0.0.1"}, Release}] = ec_dictionary:to_list(rlx_state:realized_releases(State)), @@ -370,7 +370,7 @@ make_implicit_config_release(Config) -> create_random_name("relx-output")]), ok = file:set_cwd(FooRoot), {ok, FooRoot} = file:get_cwd(), - {ok, State} = relx:do(undefined, undefined, [], [LibDir1], 2, + {ok, State} = relx:do(undefined, undefined, [], [LibDir1], 3, OutputDir, undefined), [{{foo, "0.0.1"}, Release}] = ec_dictionary:to_list(rlx_state:realized_releases(State)), ?assert(ec_file:exists(OutputDir)), @@ -417,12 +417,12 @@ make_rerun_overridden_release(Config) -> OutputDir = filename:join([proplists:get_value(data_dir, Config), create_random_name("relx-output")]), {ok, Cwd} = file:get_cwd(), - {ok, _} = relx:do(Cwd, undefined, undefined, [], [LibDir1], 2, + {ok, _} = relx:do(Cwd, undefined, undefined, [], [LibDir1], 3, OutputDir, [{OverrideAppName, OverrideAppDir}], ConfigFile), %% Now we run it again to see if it fails. - {ok, State} = relx:do(Cwd,undefined, undefined, [], [LibDir1], 2, + {ok, State} = relx:do(Cwd,undefined, undefined, [], [LibDir1], 3, OutputDir, [{OverrideAppName, OverrideAppDir}], ConfigFile), @@ -496,7 +496,7 @@ overlay_release(Config) -> OutputDir = filename:join([proplists:get_value(data_dir, Config), create_random_name("relx-output")]), - {ok, State} = relx:do(undefined, undefined, [], [LibDir1], 2, + {ok, State} = relx:do(undefined, undefined, [], [LibDir1], 3, OutputDir, ConfigFile), [{{foo, "0.0.1"}, Release}] = ec_dictionary:to_list(rlx_state:realized_releases(State)), @@ -554,7 +554,7 @@ overlay_release(Config) -> proplists:get_value(lib_dep_1_library, TemplateData)), ?assertEqual("false", proplists:get_value(lib_dep_1_link, TemplateData)), - ?assertEqual("(2:debug)", + ?assertEqual("(3:debug)", proplists:get_value(log, TemplateData)), ?assertEqual(OutputDir, proplists:get_value(output_dir, TemplateData)), @@ -609,7 +609,7 @@ make_goalless_release(Config) -> OutputDir = filename:join([proplists:get_value(data_dir, Config), create_random_name("relx-output")]), ?assertMatch({error,{rlx_prv_release,no_goals_specified}}, - relx:do(undefined, undefined, [], [LibDir1], 2, + relx:do(undefined, undefined, [], [LibDir1], 3, OutputDir, ConfigFile)). make_depfree_release(Config) -> @@ -634,7 +634,7 @@ make_depfree_release(Config) -> [goal_app_1]}]), OutputDir = filename:join([proplists:get_value(data_dir, Config), create_random_name("relx-output")]), - {ok, State} = relx:do(undefined, undefined, [], [LibDir1], 2, + {ok, State} = relx:do(undefined, undefined, [], [LibDir1], 3, OutputDir, ConfigFile), [{{foo, "0.0.1"}, Release}] = ec_dictionary:to_list(rlx_state:realized_releases(State)), AppSpecs = rlx_release:applications(Release), @@ -680,15 +680,15 @@ make_relup_release(Config) -> {goal_app_2, "0.0.3"}]}]), OutputDir = filename:join([proplists:get_value(data_dir, Config), create_random_name("relx-output")]), - {ok, _} = relx:do(foo, "0.0.1", [], [LibDir1], 2, + {ok, _} = relx:do(foo, "0.0.1", [], [LibDir1], 3, OutputDir, ConfigFile), - {ok, _} = relx:do(foo, "0.0.2", [], [LibDir1], 2, + {ok, _} = relx:do(foo, "0.0.2", [], [LibDir1], 3, OutputDir, ConfigFile), {ok, State} = relx:do([{relname, foo}, {relvsn, "0.0.3"}, {goals, []}, {lib_dirs, [LibDir1]}, - {log_level, 2}, + {log_level, 3}, {output_dir, OutputDir}, {config, ConfigFile}], ["release", "relup"]), @@ -760,16 +760,16 @@ make_relup_release2(Config) -> {goal_app_2, "0.0.3"}]}]), OutputDir = filename:join([proplists:get_value(data_dir, Config), create_random_name("relx-output")]), - {ok, _} = relx:do(foo, "0.0.1", [], [LibDir1], 2, + {ok, _} = relx:do(foo, "0.0.1", [], [LibDir1], 3, OutputDir, ConfigFile), - {ok, _} = relx:do(foo, "0.0.2", [], [LibDir1], 2, + {ok, _} = relx:do(foo, "0.0.2", [], [LibDir1], 3, OutputDir, ConfigFile), {ok, State} = relx:do([{relname, foo}, {relvsn, "0.0.3"}, {upfrom, "0.0.1"}, {goals, []}, {lib_dirs, [LibDir1]}, - {log_level, 2}, + {log_level, 3}, {output_dir, OutputDir}, {config, ConfigFile}], ["release", "relup"]), @@ -816,7 +816,7 @@ make_one_app_top_level_release(Config) -> {ok, Cwd} = file:get_cwd(), ok = file:set_cwd(AppDir), - {ok, State} = relx:do(undefined, undefined, [], [], 2, + {ok, State} = relx:do(undefined, undefined, [], [], 3, OutputDir, ConfigFile), ok = file:set_cwd(Cwd), [{{foo, "0.0.1"}, Release}] = ec_dictionary:to_list(rlx_state:realized_releases(State)), -- cgit v1.2.3