diff options
| author | Fred Hebert <mononcqc@ferd.ca> | 2019-05-06 14:49:35 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-05-06 14:49:35 -0400 |
| commit | 4b610f56e6a8d23aee66a925222abed0f206a6e9 (patch) | |
| tree | 9cb2ec9fd42d3f5f99bce73c8d75a7a8312d3788 /test | |
| parent | ec224b7921cda1f9a1ef4373e80e706c173bf75f (diff) | |
| parent | 199705762c9fa0e0ff9cf494df731fe8fc9f4406 (diff) | |
Merge pull request #2032 from fenollp/p-hex
format hex packages in a nice/human way
Diffstat (limited to 'test')
| -rw-r--r-- | test/rebar_deps_SUITE.erl | 11 | ||||
| -rw-r--r-- | test/rebar_install_deps_SUITE.erl | 11 |
2 files changed, 14 insertions, 8 deletions
diff --git a/test/rebar_deps_SUITE.erl b/test/rebar_deps_SUITE.erl index f9be2a3..58b9742 100644 --- a/test/rebar_deps_SUITE.erl +++ b/test/rebar_deps_SUITE.erl @@ -560,10 +560,13 @@ check_warnings(Warns, [{Name, Vsn} | Rest], Type) -> in_warnings(git, Warns, NameRaw, VsnRaw) -> Name = iolist_to_binary(NameRaw), - 1 =< length([1 || {_, [AppName, {git, _, {_, Vsn}}]} <- Warns, - AppName =:= Name, Vsn =:= VsnRaw]); + Vsn = iolist_to_binary([$",VsnRaw,$"]), + 1 =< length([1 || {_, [[AppName, $\s,$(,$f,$r,$o,$m,$\s,[${,["git",$,, _URL, $,,[${,["tag",$,, AppVsn], $}]],$}],$)]]} <- Warns, + iolist_to_binary(AppName) =:= Name, + iolist_to_binary(AppVsn) =:= Vsn]); in_warnings(pkg, Warns, NameRaw, VsnRaw) -> Name = iolist_to_binary(NameRaw), Vsn = iolist_to_binary(VsnRaw), - 1 =< length([1 || {_, [AppName, {pkg, _, AppVsn}]} <- Warns, - AppName =:= Name, AppVsn =:= Vsn]). + 1 =< length([1 || {_, [[AppName, $\s,$v, AppVsn]]} <- Warns, + iolist_to_binary(AppName) =:= Name, + iolist_to_binary(AppVsn) =:= Vsn]). diff --git a/test/rebar_install_deps_SUITE.erl b/test/rebar_install_deps_SUITE.erl index 96b9d38..81c751b 100644 --- a/test/rebar_install_deps_SUITE.erl +++ b/test/rebar_install_deps_SUITE.erl @@ -481,10 +481,13 @@ check_warnings(Warns, none, _Type) -> in_warnings(git, Warns, NameRaw, VsnRaw) -> Name = iolist_to_binary(NameRaw), - 1 =< length([1 || {_, [AppName, {git, _, {_, Vsn}}]} <- Warns, - AppName =:= Name, Vsn =:= VsnRaw]); + Vsn = iolist_to_binary([$",VsnRaw,$"]), + 1 =< length([1 || {_, [[AppName, $\s,$(,$f,$r,$o,$m,$\s,[${,["git",$,, _URL, $,,[${,["tag",$,, AppVsn], $}]],$}],$)]]} <- Warns, + iolist_to_binary(AppName) =:= Name, + iolist_to_binary(AppVsn) =:= Vsn]); in_warnings(pkg, Warns, NameRaw, VsnRaw) -> Name = iolist_to_binary(NameRaw), Vsn = iolist_to_binary(VsnRaw), - 1 =< length([1 || {_, [AppName, {pkg, _, AppVsn}]} <- Warns, - AppName =:= Name, AppVsn =:= Vsn]). + 1 =< length([1 || {_, [[AppName, $\s,$v, AppVsn]]} <- Warns, + iolist_to_binary(AppName) =:= Name, + iolist_to_binary(AppVsn) =:= Vsn]). |