From dd55959854069553b40f2bc2f2f7c5c7fc7c5a94 Mon Sep 17 00:00:00 2001 From: Tristan Sloughter Date: Fri, 9 May 2014 08:45:24 -0500 Subject: refactor tar and relup commands to own providers --- test/rlx_command_SUITE.erl | 2 +- test/rlx_release_SUITE.erl | 9 ++++----- 2 files changed, 5 insertions(+), 6 deletions(-) (limited to 'test') diff --git a/test/rlx_command_SUITE.erl b/test/rlx_command_SUITE.erl index e26e0ad..c34ed88 100644 --- a/test/rlx_command_SUITE.erl +++ b/test/rlx_command_SUITE.erl @@ -65,7 +65,7 @@ normal_passing_case(Config) -> {ok, State2} = rlx_provider:do(ConfigProvider, State1), ?assertMatch([Lib1, Lib2], rlx_state:lib_dirs(State2)), - ?assertMatch(Outdir, rlx_state:output_dir(State2)), + ?assertMatch(Outdir, rlx_state:base_output_dir(State2)), ?assertMatch([{app1,{{33,33},{[],[<<"build4">>]}},lte}, {app2, diff --git a/test/rlx_release_SUITE.erl b/test/rlx_release_SUITE.erl index 0382a26..6f067dc 100644 --- a/test/rlx_release_SUITE.erl +++ b/test/rlx_release_SUITE.erl @@ -222,7 +222,6 @@ make_scriptless_release(Config) -> ?assert(lists:member({goal_app_2, "0.0.1"}, AppSpecs)), ?assert(lists:member({lib_dep_1, "0.0.1", load}, AppSpecs)). - make_overridden_release(Config) -> DataDir = proplists:get_value(data_dir, Config), OverrideDir1 = filename:join([DataDir, create_random_name("override_dir_")]), @@ -565,10 +564,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, "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]))), + ?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]))), TemplateData = case file:consult(filename:join([OutputDir, "foo", "test_template_resolved"])) of {ok, Details} -> -- cgit v1.2.3