aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn Högberg <[email protected]>2018-07-05 12:40:29 +0200
committerJohn Högberg <[email protected]>2018-07-05 12:40:29 +0200
commitbc15cafa37d9b42b8676a40b3befea2e68cacd1b (patch)
treef0c2516db0056ecdd6f03ffd5fd04c1012c03710
parent2d7362c6e1c031a5cb68465fad613c5219956875 (diff)
parentfdb9fea10c79df2a5a2f49a5cc9cc1d6b12d2960 (diff)
downloadotp-bc15cafa37d9b42b8676a40b3befea2e68cacd1b.tar.gz
otp-bc15cafa37d9b42b8676a40b3befea2e68cacd1b.tar.bz2
otp-bc15cafa37d9b42b8676a40b3befea2e68cacd1b.zip
Merge branch 'john/tools/cuddle-instrument-suite'
* john/tools/cuddle-instrument-suite: Make instrument suite more stable after PR-1854
-rw-r--r--lib/tools/test/instrument_SUITE.erl7
1 files changed, 4 insertions, 3 deletions
diff --git a/lib/tools/test/instrument_SUITE.erl b/lib/tools/test/instrument_SUITE.erl
index 33800c5934..33259df58f 100644
--- a/lib/tools/test/instrument_SUITE.erl
+++ b/lib/tools/test/instrument_SUITE.erl
@@ -221,7 +221,7 @@ verify_carriers_output(#{ histogram_start := HistStart,
ct:fail("Carrier count is ~p, expected at least ~p (SBC).",
[CarrierCount, GenSBCCount]);
CarrierCount >= GenSBCCount ->
- ct:pal("Found ~p blocks, required at least ~p (SBC)." ,
+ ct:pal("Found ~p carriers, required at least ~p (SBC)." ,
[CarrierCount, GenSBCCount])
end,
@@ -327,8 +327,9 @@ generate_test_blocks() ->
MBCs = [<<I, 0:64/unit:8>> ||
I <- lists:seq(1, ?GENERATED_MBC_BLOCK_COUNT)],
Runner ! Ref,
- receive after infinity -> ok end,
- unreachable ! {SBCs, MBCs}
+ receive
+ gurka -> gaffel ! {SBCs, MBCs}
+ end
end),
receive
Ref -> ok