diff options
| author | Fred Hebert <mononcqc@ferd.ca> | 2015-08-03 13:28:06 -0400 |
|---|---|---|
| committer | Fred Hebert <mononcqc@ferd.ca> | 2015-08-03 13:28:06 -0400 |
| commit | a705f1e4f6a93313546fd68ce857a6d69a45661a (patch) | |
| tree | bc6f0f86d129a0f417f7e649802b2faf54d21309 /test | |
| parent | e786d8eb6a37f5e651dc911fec85445d850d28e6 (diff) | |
| parent | 6d01729c682fa56933753ef70c1e97b4b19042d8 (diff) | |
Merge pull request #682 from tsloughter/upgrade_lock_dep
upgrade depends on the lock provider and lock prv sets state
Diffstat (limited to 'test')
| -rw-r--r-- | test/rebar_upgrade_SUITE.erl | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/test/rebar_upgrade_SUITE.erl b/test/rebar_upgrade_SUITE.erl index f2d4133..4ab99c7 100644 --- a/test/rebar_upgrade_SUITE.erl +++ b/test/rebar_upgrade_SUITE.erl @@ -48,7 +48,7 @@ init_per_testcase(novsn_pkg, Config0) -> end}, {mock_update, fun() -> catch mock_pkg_resource:unmock(), - mock_pkg_resource:mock([{pkgdeps, UpDeps}, {upgrade, Upgrades}]) + mock_pkg_resource:mock([{pkgdeps, UpDeps++Deps}, {upgrade, Upgrades}]) end}, {expected, {ok, [{dep, "fakeapp", "1.1.0"}, {lock, "fakeapp", "1.1.0"}]}} | Config]; @@ -430,14 +430,12 @@ mock_deps(pkg, Deps, Upgrades) -> catch mock_pkg_resource:unmock(), mock_pkg_resource:mock([{pkgdeps, rebar_test_utils:flat_pkgdeps(Deps)}, {upgrade, Upgrades}]). -mock_deps(git, _OldDeps, Deps, Upgrades) -> +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_git_resource:mock([{deps, rebar_test_utils:flat_deps(Deps++OldDeps)}, {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}]). + mock_pkg_resource:mock([{pkgdeps, rebar_test_utils:flat_pkgdeps(Deps++OldDeps)}, {upgrade, Upgrades}]). normalize_unlocks({App, Locks}) -> {iolist_to_binary(App), |