From 8015b8d46ff38fc05cac9cf8df9a37b5580e8909 Mon Sep 17 00:00:00 2001 From: Sverker Eriksson Date: Wed, 18 Nov 2015 14:58:41 +0100 Subject: erl_interface: Cuddle test ei_tmo_SUITE Increase max number of messages sent to fill buffers. --- lib/erl_interface/test/ei_tmo_SUITE.erl | 4 ++-- lib/erl_interface/test/ei_tmo_SUITE_data/ei_tmo_test.c | 11 +++++++---- 2 files changed, 9 insertions(+), 6 deletions(-) (limited to 'lib') diff --git a/lib/erl_interface/test/ei_tmo_SUITE.erl b/lib/erl_interface/test/ei_tmo_SUITE.erl index 5ee7198c53..aaa0992fb4 100644 --- a/lib/erl_interface/test/ei_tmo_SUITE.erl +++ b/lib/erl_interface/test/ei_tmo_SUITE.erl @@ -164,12 +164,12 @@ do_one_send_failure(Config,From,FakeName,CName,VxSim) -> {term, X} = runner:get_term(P3, 10000), true = is_integer(X), Message = [112,term_to_binary({6,self(),'',test}), - term_to_binary({From,10000, + term_to_binary({From,50000, {app,["lapp",{sa,["att",du,{slapp, sitta}]}]}})], gen_tcp:send(SocketB,Message), - %% At this point the test program starts sending messages (max 10000). Since + %% At this point the test program starts sending messages (max 50000). Since %% we're not receiving, eventually the send buffer fills up. Then no more %% sending is possible and select() times out. The number of messages sent %% before this happens is returned in Iters. The timeout value for get_term/2 diff --git a/lib/erl_interface/test/ei_tmo_SUITE_data/ei_tmo_test.c b/lib/erl_interface/test/ei_tmo_SUITE_data/ei_tmo_test.c index 1104f642a2..78dc9c5b8a 100644 --- a/lib/erl_interface/test/ei_tmo_SUITE_data/ei_tmo_test.c +++ b/lib/erl_interface/test/ei_tmo_SUITE_data/ei_tmo_test.c @@ -512,18 +512,21 @@ TESTCASE(send_tmo) for (i=0;i < iterations; ++i) { res = ei_send_tmo(com_sock, &pid, send_buffer.buff, send_buffer.index, 5000); - DEBUGF(("Sent bindata (%d):\n",res)); + if (res < 0) { + DEBUGF(("Sent bindata failed (%d) after %d iterations:\n", res, i)); + break; + } #ifdef DEBUG + if (i < 10 || (i % 100 == 0)) /* don't flood the log */ { int ndx = 0; int v; + DEBUGF(("%d: Sent bindata (%d): ", i, res)); ei_decode_version(send_buffer.buff,&ndx,&v); ei_print_term(debugfile, send_buffer.buff, &ndx); + DEBUGF(("\n")); } #endif - DEBUGF(("\n")); - if (res < 0) - break; } if (res < 0) { DEBUGF(("ei_send_tmo failure at line %d\n",__LINE__)); -- cgit v1.2.3