File 4356-kernel-sctp-test-Be-more-verbose-when-failing-xfer_s.patch of Package erlang
From 33ecf032c2a0752d21e1037d798207ca5421e377 Mon Sep 17 00:00:00 2001
From: Micael Karlberg <bmk@erlang.org>
Date: Wed, 27 May 2020 15:57:52 +0200
Subject: [PATCH 6/9] [kernel|sctp|test] Be more verbose when failing
xfer_stream_min
---
lib/kernel/test/gen_sctp_SUITE.erl | 35 +++++++++++++++++-------------
1 file changed, 20 insertions(+), 15 deletions(-)
diff --git a/lib/kernel/test/gen_sctp_SUITE.erl b/lib/kernel/test/gen_sctp_SUITE.erl
index 4fc2496010..6ec3043516 100644
--- a/lib/kernel/test/gen_sctp_SUITE.erl
+++ b/lib/kernel/test/gen_sctp_SUITE.erl
@@ -1027,30 +1027,35 @@ xfer_stream_min(Config) when is_list(Config) ->
assoc_id=SbAssocId}],
Data} -> ok;
{Loopback,
- Pa,[],
- #sctp_paddr_change{addr = {Loopback,_},
- state = addr_available,
- error = 0,
+ Pa,
+ [],
+ #sctp_paddr_change{addr = {Loopback,_},
+ state = addr_available,
+ error = 0,
assoc_id = SbAssocId}} ->
{Loopback,
Pa,
- [#sctp_sndrcvinfo{stream=Stream,
- assoc_id=SbAssocId}],
+ [#sctp_sndrcvinfo{stream = Stream,
+ assoc_id = SbAssocId}],
Data} = log_ok(gen_sctp:recv(Sb, infinity));
+
+ %% It seems that on FreeBSD (for instance) we don't get any
+ %% AncData with this, so this test fails.
+ %% Shall we augment, or is it an actual fault?
{Loopback,
Pa,
- [#sctp_sndrcvinfo{stream=Stream,
- assoc_id=SbAssocId}],
- #sctp_paddr_change{addr = {Loopback,_},
- state = addr_confirmed,
- error = 0,
+ [#sctp_sndrcvinfo{stream = Stream,
+ assoc_id = SbAssocId}],
+ #sctp_paddr_change{addr = {Loopback,_},
+ state = addr_confirmed,
+ error = 0,
assoc_id = SbAssocId}} ->
{Loopback,
Pa,
- [#sctp_sndrcvinfo{stream=Stream,
- assoc_id=SbAssocId}],
+ [#sctp_sndrcvinfo{stream = Stream,
+ assoc_id = SbAssocId}],
Data} = log_ok(gen_sctp:recv(Sb, infinity));
- {FromIP, FromPort, AncData, Data} = Other1 ->
+ {FromIPX, FromPortX, AncDataX, DataX} = Other1 ->
p("UNEXPECTED: "
"~n FromIP: ~p"
"~n FromPort: ~p"
@@ -1059,7 +1064,7 @@ xfer_stream_min(Config) when is_list(Config) ->
"~nwhen"
"~n Loopback: ~p"
"~n Pa: ~p",
- [FromIP, FromPort, AncData, Data, Loopback, Pa]),
+ [FromIPX, FromPortX, AncDataX, DataX, Loopback, Pa]),
exit({unexpected, Other1});
Other2 ->
p("UNEXPECTED: "
--
2.26.2