diff options
author | Tristan Sloughter <t@crashfast.com> | 2018-09-17 09:02:30 -0600 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-09-17 09:02:30 -0600 |
commit | 43769ae87f7c60a9b6cb3bf08085a4a4206961b7 (patch) | |
tree | 189ba2fa439cf4674cb7ea4c6df6637b889c7429 /test | |
parent | cd858a45e37f6563f22bf3aebee5911521f3c497 (diff) |
only print skip warning if version is different (#1886)
Diffstat (limited to 'test')
-rw-r--r-- | test/rebar_install_deps_SUITE.erl | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/test/rebar_install_deps_SUITE.erl b/test/rebar_install_deps_SUITE.erl index 04cc441..96b9d38 100644 --- a/test/rebar_install_deps_SUITE.erl +++ b/test/rebar_install_deps_SUITE.erl @@ -17,7 +17,7 @@ groups() -> {mixed, [], [ m_flat1, m_flat2, m_circular1, m_circular2, m_pick_source1, m_pick_source2, m_pick_source3, - m_pick_source4, m_pick_source5, m_source_to_pkg, + m_pick_source4, m_pick_source5, m_pick_source6, m_source_to_pkg, m_pkg_level1, m_pkg_level2, m_pkg_level3, m_pkg_level3_alpha_order ]} ]. @@ -93,6 +93,8 @@ format_expected_mdeps(Deps) -> [{dep, N}, {lock, src, N, "0.0.0"}] end || Dep <- Deps]). +format_expected_mixed_warnings(none) -> + none; format_expected_mixed_warnings(Warnings) -> [case W of {N, Vsn} when hd(N) >= $a, hd(N) =< $z -> {pkg, rebar_string:uppercase(N), Vsn}; @@ -225,6 +227,11 @@ mdeps(m_pick_source5) -> {"C", [{"D", "1.0.0", []}]}], [{"D", "1.0.0"}], {ok, ["B", "C", {"d", "1.0.0"}]}}; +mdeps(m_pick_source6) -> + {[{"B", [{"D", "1.0.0", []}]}, + {"C", [{"D", "1.0.0", []}]}], + none, + {ok, ["B", "C", {"D", "1.0.0"}]}}; mdeps(m_source_to_pkg) -> {[{"B", [{"c",[{"d", []}]}]}], [], @@ -436,6 +443,7 @@ m_pick_source2(Config) -> run(Config). m_pick_source3(Config) -> run(Config). m_pick_source4(Config) -> run(Config). m_pick_source5(Config) -> run(Config). +m_pick_source6(Config) -> run(Config). m_source_to_pkg(Config) -> run(Config). m_pkg_level1(Config) -> run(Config). m_pkg_level2(Config) -> run(Config). @@ -466,7 +474,10 @@ check_warnings(Warns, [{Type, Name, Vsn} | Rest], mixed) -> check_warnings(Warns, [{Name, Vsn} | Rest], Type) -> ct:pal("Checking for warning ~p in ~p", [{Name,Vsn},Warns]), ?assert(in_warnings(Type, Warns, Name, Vsn)), - check_warnings(Warns, Rest, Type). + check_warnings(Warns, Rest, Type); +check_warnings(Warns, none, _Type) -> + ct:pal("Checking that there were no warnings", []), + ?assert(Warns == []). in_warnings(git, Warns, NameRaw, VsnRaw) -> Name = iolist_to_binary(NameRaw), |