diff options
Diffstat (limited to 'test/rebar_upgrade_SUITE.erl')
| -rw-r--r-- | test/rebar_upgrade_SUITE.erl | 70 |
1 files changed, 20 insertions, 50 deletions
diff --git a/test/rebar_upgrade_SUITE.erl b/test/rebar_upgrade_SUITE.erl index ed0b2d8..14186be 100644 --- a/test/rebar_upgrade_SUITE.erl +++ b/test/rebar_upgrade_SUITE.erl @@ -3,7 +3,7 @@ -include_lib("eunit/include/eunit.hrl"). -compile(export_all). -all() -> [{group, git}].%, {group, pkg}]. +all() -> [{group, git}, {group, pkg}]. groups() -> [{all, [], [top_a, top_b, top_c, top_d1, top_d2, top_e, @@ -34,11 +34,11 @@ end_per_group(_, Config) -> init_per_testcase(Case, Config) -> DepsType = ?config(deps_type, Config), {Deps, UpDeps, ToUp, Expectations} = upgrades(Case), - Expanded = expand_deps(DepsType, Deps), - UpExpanded = expand_deps(DepsType, UpDeps), + Expanded = rebar_test_utils:expand_deps(DepsType, Deps), + UpExpanded = rebar_test_utils:expand_deps(DepsType, UpDeps), [{expected, normalize_unlocks(Expectations)}, {mock, fun() -> mock_deps(DepsType, Expanded, []) end}, - {mock_update, fun() -> mock_deps(DepsType, UpExpanded, ToUp) end} + {mock_update, fun() -> mock_deps(DepsType, Expanded, UpExpanded, ToUp) end} | setup_project(Case, Config, Expanded, UpExpanded)]. end_per_testcase(_, Config) -> @@ -53,10 +53,10 @@ setup_project(Case, Config0, Deps, UpDeps) -> ), AppDir = ?config(apps, Config), rebar_test_utils:create_app(AppDir, "Root", "0.0.0", [kernel, stdlib]), - TopDeps = top_level_deps(Deps), + TopDeps = rebar_test_utils:top_level_deps(Deps), RebarConf = rebar_test_utils:create_config(AppDir, [{deps, TopDeps}]), [{rebarconfig, RebarConf}, - {next_top_deps, top_level_deps(UpDeps)} | Config]. + {next_top_deps, rebar_test_utils:top_level_deps(UpDeps)} | Config]. upgrades(top_a) -> @@ -206,7 +206,7 @@ upgrades(triplet_b) -> {"G",[]}]}, {"C", "0", [{"H","3",[]}, {"I",[]}]}], - [{"A", "1", [{"D",[]}, + [{"A", "2", [{"D",[]}, {"E","2",[]}]}, {"B", "1", [{"F","1",[]}, {"G",[]}]}, @@ -223,7 +223,7 @@ upgrades(triplet_c) -> {"G",[]}]}, {"C", "0", [{"H","3",[]}, {"I",[]}]}], - [{"A", "1", [{"D",[]}, + [{"A", "2", [{"D",[]}, {"E","2",[]}]}, {"B", "1", [{"F","1",[]}, {"G",[]}]}, @@ -245,7 +245,7 @@ upgrades(tree_a) -> {"E",[{"I","1",[]}]}]}, {"B", "1", [{"F",[]}, {"G",[]}]}, - {"C", "1", [{"H",[]}]} + {"C", "2", [{"H",[]}]} ], ["C"], {"A", [{"A","1"}, "D", "J", "E", @@ -263,7 +263,7 @@ upgrades(tree_b) -> {"E",[{"I","1",[]}]}]}, {"B", "1", [{"F",[]}, {"G",[]}]}, - {"C", "1", [{"H",[]}]} + {"C", "2", [{"H",[]}]} ], ["C"], {"B", [{"A","1"}, "D", "J", "E", @@ -356,51 +356,21 @@ upgrades(delete_d) -> %% TODO: add a test that verifies that unlocking files and then %% running the upgrade code is enough to properly upgrade things. -top_level_deps([]) -> []; -top_level_deps([{{pkg, Name, Vsn}, _} | Deps]) -> - [{list_to_atom(Name), Vsn} | top_level_deps(Deps)]; -top_level_deps([{{Name, Vsn, Ref}, _} | Deps]) -> - [{list_to_atom(Name), Vsn, Ref} | top_level_deps(Deps)]. - mock_deps(git, Deps, Upgrades) -> catch mock_git_resource:unmock(), - mock_git_resource:mock([{deps, flat_deps(Deps)}, {upgrade, Upgrades}]); + mock_git_resource:mock([{deps, rebar_test_utils:flat_deps(Deps)}, {upgrade, Upgrades}]); mock_deps(pkg, Deps, Upgrades) -> catch mock_pkg_resource:unmock(), - mock_pkg_resource:mock([{pkgdeps, flat_pkgdeps(Deps)}, {upgrade, Upgrades}]). + mock_pkg_resource:mock([{pkgdeps, rebar_test_utils:flat_pkgdeps(Deps)}, {upgrade, Upgrades}]). -flat_deps([]) -> []; -flat_deps([{{Name,_Vsn,Ref}, Deps} | Rest]) -> - [{{Name,vsn_from_ref(Ref)}, top_level_deps(Deps)}] - ++ - flat_deps(Deps) - ++ - flat_deps(Rest). - -vsn_from_ref({git, _, {_, Vsn}}) -> Vsn; -vsn_from_ref({git, _, Vsn}) -> Vsn. - -flat_pkgdeps([]) -> []; -flat_pkgdeps([{{pkg, Name, Vsn}, Deps} | Rest]) -> - [{{iolist_to_binary(Name),iolist_to_binary(Vsn)}, top_level_deps(Deps)}] - ++ - flat_pkgdeps(Deps) - ++ - flat_pkgdeps(Rest). - -expand_deps(_, []) -> []; -expand_deps(git, [{Name, Deps} | Rest]) -> - Dep = {Name, ".*", {git, "https://example.org/user/"++Name++".git", "master"}}, - [{Dep, expand_deps(git, Deps)} | expand_deps(git, Rest)]; -expand_deps(git, [{Name, Vsn, Deps} | Rest]) -> - Dep = {Name, Vsn, {git, "https://example.org/user/"++Name++".git", {tag, Vsn}}}, - [{Dep, expand_deps(git, Deps)} | expand_deps(git, Rest)]; -expand_deps(pkg, [{Name, Deps} | Rest]) -> - Dep = {pkg, Name, "0.0.0"}, - [{Dep, expand_deps(pkg, Deps)} | expand_deps(pkg, Rest)]; -expand_deps(pkg, [{Name, Vsn, Deps} | Rest]) -> - Dep = {pkg, Name, Vsn}, - [{Dep, expand_deps(pkg, Deps)} | expand_deps(pkg, Rest)]. +mock_deps(git, _OldDeps, Deps, Upgrades) -> + catch mock_git_resource:unmock(), + mock_git_resource:mock([{deps, rebar_test_utils:flat_deps(Deps)}, {upgrade, Upgrades}]); +mock_deps(pkg, OldDeps, Deps, Upgrades) -> + Merged = Deps ++ [Dep || Dep <- OldDeps, + not lists:keymember(element(1, Dep), 1, Deps)], + catch mock_pkg_resource:unmock(), + mock_pkg_resource:mock([{pkgdeps, rebar_test_utils:flat_pkgdeps(Merged)}, {upgrade, Upgrades}]). normalize_unlocks({App, Locks}) -> {iolist_to_binary(App), |