aboutsummaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
Diffstat (limited to 'test')
-rw-r--r--test/rlx_command_SUITE.erl12
-rw-r--r--test/rlx_depsolver_tester.erl1
-rw-r--r--test/rlx_discover_SUITE.erl7
-rw-r--r--test/rlx_release_SUITE.erl14
4 files changed, 21 insertions, 13 deletions
diff --git a/test/rlx_command_SUITE.erl b/test/rlx_command_SUITE.erl
index 2e1ef1d..e26e0ad 100644
--- a/test/rlx_command_SUITE.erl
+++ b/test/rlx_command_SUITE.erl
@@ -61,15 +61,17 @@ normal_passing_case(Config) ->
"-n", RelName, "-v", RelVsn, "-o", Outdir],
{ok, {Opts, Targets}} = getopt:parse(relx:opt_spec_list(), CmdLine),
{ok, State} = rlx_cmd_args:args2state(Opts, Targets),
+ {ConfigProvider, {ok, State1}} = rlx_provider:new(rlx_prv_config, State),
+ {ok, State2} = rlx_provider:do(ConfigProvider, State1),
?assertMatch([Lib1, Lib2],
- rlx_state:lib_dirs(State)),
- ?assertMatch(Outdir, rlx_state:base_output_dir(State)),
+ rlx_state:lib_dirs(State2)),
+ ?assertMatch(Outdir, rlx_state:output_dir(State2)),
?assertMatch([{app1,{{33,33},{[],[<<"build4">>]}},lte},
{app2,
{{33,22},{[],[]}},
{{45,22},{[],[<<"build">>,21]}}, between}],
- rlx_state:goals(State)).
+ rlx_state:goals(State2)).
lib_expansion_case(Config) ->
DataDir = proplists:get_value(data_dir, Config),
@@ -81,8 +83,10 @@ lib_expansion_case(Config) ->
CmdLine = ["-l", filename:join(DataDir, "*")],
{ok, {Opts, Targets}} = getopt:parse(relx:opt_spec_list(), CmdLine),
{ok, State} = rlx_cmd_args:args2state(Opts, Targets),
+ {ConfigProvider, {ok, State1}} = rlx_provider:new(rlx_prv_config, State),
+ {ok, State2} = rlx_provider:do(ConfigProvider, State1),
?assertMatch([Lib1, Lib2],
- rlx_state:lib_dirs(State)).
+ rlx_state:lib_dirs(State2)).
lib_fail_case(Config) ->
DataDir = proplists:get_value(data_dir, Config),
diff --git a/test/rlx_depsolver_tester.erl b/test/rlx_depsolver_tester.erl
index 2dddf76..b441a1e 100644
--- a/test/rlx_depsolver_tester.erl
+++ b/test/rlx_depsolver_tester.erl
@@ -365,7 +365,6 @@ fix_rebar_brokenness(Filename) ->
true ->
Alt2;
false ->
- io:format("~p~n", [Alt2]),
erlang:throw(unable_to_find_data_files)
end
end.
diff --git a/test/rlx_discover_SUITE.erl b/test/rlx_discover_SUITE.erl
index 8ea95c4..7e7015c 100644
--- a/test/rlx_discover_SUITE.erl
+++ b/test/rlx_discover_SUITE.erl
@@ -48,10 +48,12 @@ init_per_testcase(_, Config) ->
LibDir2 = filename:join([DataDir, create_random_name("lib_dir2_")]),
ok = rlx_util:mkdir_p(LibDir1),
ok = rlx_util:mkdir_p(LibDir2),
- State = rlx_state:new([{lib_dirs, [LibDir1, LibDir2]}], [release]),
+ State = rlx_state:new([], [{lib_dirs, [LibDir1, LibDir2]}], [release]),
+ {ConfigProvider, {ok, State1}} = rlx_provider:new(rlx_prv_config, State),
+ {ok, State2} = rlx_provider:do(ConfigProvider, State1),
[{lib1, LibDir1},
{lib2, LibDir2},
- {state, State} | Config].
+ {state, State2} | Config].
all() ->
@@ -78,6 +80,7 @@ normal_case(Config) ->
default_libs, false),
{DiscoverProvider, {ok, State1}} = rlx_provider:new(rlx_prv_discover, State0),
{ok, State2} = rlx_provider:do(DiscoverProvider, State1),
+
lists:foreach(fun(App) ->
?assertMatch(true, lists:member(App, rlx_state:available_apps(State2)))
end, Apps1),
diff --git a/test/rlx_release_SUITE.erl b/test/rlx_release_SUITE.erl
index 730e1d1..0382a26 100644
--- a/test/rlx_release_SUITE.erl
+++ b/test/rlx_release_SUITE.erl
@@ -60,9 +60,11 @@ init_per_testcase(_, Config) ->
DataDir = proplists:get_value(data_dir, Config),
LibDir1 = filename:join([DataDir, create_random_name("lib_dir1_")]),
ok = rlx_util:mkdir_p(LibDir1),
- State = rlx_state:new([{lib_dirs, [LibDir1]}], [release]),
+ State = rlx_state:new([], [{lib_dirs, [LibDir1]}], [release]),
+ {ConfigProvider, {ok, State1}} = rlx_provider:new(rlx_prv_config, State),
+ {ok, State2} = rlx_provider:do(ConfigProvider, State1),
[{lib1, LibDir1},
- {state, State} | Config].
+ {state, State2} | Config].
all() ->
[make_release, make_extend_release, make_scriptless_release,
@@ -563,10 +565,10 @@ overlay_release(Config) ->
?assert(lists:member({goal_app_2, "0.0.1"}, AppSpecs)),
?assert(lists:member({lib_dep_1, "0.0.1", load}, AppSpecs)),
- ?assert(ec_file:exists(filename:join([OutputDir, "foo", "fooo"]))),
- ?assert(ec_file:exists(filename:join([OutputDir, "foo", "foodir", "vars1.config"]))),
- ?assert(ec_file:exists(filename:join([OutputDir, "foo", "yahoo", "vars1.config"]))),
- ?assert(ec_file:exists(filename:join([OutputDir, "foo", SecondTestDir, TestDir, TestFile]))),
+ ?assert(ec_file:exists(filename:join(OutputDir, "fooo"))),
+ ?assert(ec_file:exists(filename:join([OutputDir, "foodir", "vars1.config"]))),
+ ?assert(ec_file:exists(filename:join([OutputDir, "yahoo", "vars1.config"]))),
+ ?assert(ec_file:exists(filename:join([OutputDir, SecondTestDir, TestDir, TestFile]))),
TemplateData = case file:consult(filename:join([OutputDir, "foo", "test_template_resolved"])) of
{ok, Details} ->