From d4bca1d6c5b7ce4dd128c4f20fbfe7a1cf52cc69 Mon Sep 17 00:00:00 2001 From: Tristan Sloughter Date: Thu, 13 Aug 2015 19:21:17 -0500 Subject: [PATCH] update lock tests to not expect lock for non-default profile run --- test/rebar_install_deps_SUITE.erl | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/test/rebar_install_deps_SUITE.erl b/test/rebar_install_deps_SUITE.erl index be42e68a..4e6c3d96 100644 --- a/test/rebar_install_deps_SUITE.erl +++ b/test/rebar_install_deps_SUITE.erl @@ -240,6 +240,9 @@ default_profile(Config) -> {ok, RebarConfig} = file:consult(?config(rebarconfig, Config)), AppDir = ?config(apps, Config), {ok, Apps} = Expect = ?config(expect, Config), + rebar_test_utils:run_and_check( + Config, RebarConfig, ["lock"], Expect + ), rebar_test_utils:run_and_check( Config, RebarConfig, ["as", "profile", "lock"], Expect ), @@ -252,6 +255,9 @@ default_profile(Config) -> file:read_file_info(filename:join([BuildDir, "profile", "lib", App]))) || {dep, App} <- Apps], %% A second run to another profile also links default to the right spot + rebar_test_utils:run_and_check( + Config, RebarConfig, ["lock"], Expect + ), rebar_test_utils:run_and_check( Config, RebarConfig, ["as", "other", "lock"], Expect ), @@ -296,10 +302,13 @@ nondefault_profile(Config) -> nondefault_pick_highest(Config) -> {ok, RebarConfig} = file:consult(?config(rebarconfig, Config)), - %AppDir = ?config(apps, Config), + rebar_test_utils:run_and_check( + Config, RebarConfig, ["lock"], + {ok, [{dep, "B"}, {lock, "B"}, {lock, "C", "1"}, {dep, "C", "1"}], "default"} + ), rebar_test_utils:run_and_check( Config, RebarConfig, ["as", "nondef", "lock"], - {ok, [{dep, "B"}, {lock, "B"}, {dep, "C", "2"}], "nondef"} + {ok, [{dep, "B"}, {lock, "B"}, {lock, "C", "1"}, {dep, "C", "2"}], "nondef"} ), rebar_test_utils:run_and_check( Config, RebarConfig, ["lock"], @@ -307,7 +316,7 @@ nondefault_pick_highest(Config) -> ), rebar_test_utils:run_and_check( Config, RebarConfig, ["as", "nondef", "lock"], - {ok, [{dep, "B"}, {lock, "B"}, {dep, "C", "2"}], "nondef"} + {ok, [{dep, "B"}, {lock, "B"}, {lock, "C", "1"}, {dep, "C", "2"}], "nondef"} ). run(Config) ->