From 199705762c9fa0e0ff9cf494df731fe8fc9f4406 Mon Sep 17 00:00:00 2001 From: Pierre Fenoll Date: Mon, 6 May 2019 18:39:05 +0200 Subject: maybe a bit too exhaustive pattern matching to pass tests Signed-off-by: Pierre Fenoll --- test/rebar_deps_SUITE.erl | 11 +++++++---- test/rebar_install_deps_SUITE.erl | 11 +++++++---- 2 files changed, 14 insertions(+), 8 deletions(-) (limited to 'test') 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]). -- cgit v1.1