ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'greentea_improvements' of https://github.com/michalpasztamobica/mbed-os into dev_rollup

pull/8838/head
Martin Kojtal 2018-11-23 18:37:52 +00:00
parent 61c7947b47 e53ee631f9
commit 36bc2efdec
4 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
TESTS/netsocket/dns/asynchronous_dns_non_async_and_async.cpp
View File

@ -45,7 +45,7 @@ void ASYNCHRONOUS_DNS_NON_ASYNC_AND_ASYNC()
TEST_ASSERT(strlen(addr.get_ip_address()) > 1); TEST_ASSERT(strlen(addr.get_ip_address()) > 1);
} }
semaphore.wait(); semaphore.wait(100);
TEST_ASSERT(data.result == NSAPI_ERROR_OK); TEST_ASSERT(data.result == NSAPI_ERROR_OK);

2
TESTS/netsocket/tcp/tcp_tests.h
View File

@ -30,7 +30,7 @@ nsapi_error_t tcpsocket_connect_to_discard_srv(TCPSocket &sock);
int split2half_rmng_tcp_test_time(); // [s] int split2half_rmng_tcp_test_time(); // [s]
namespace tcp_global { namespace tcp_global {
static const int TESTS_TIMEOUT = 960; static const int TESTS_TIMEOUT = 480;
static const int TCP_OS_STACK_SIZE = 2048; static const int TCP_OS_STACK_SIZE = 2048;
static const int RX_BUFF_SIZE = 1220; static const int RX_BUFF_SIZE = 1220;

4
TESTS/netsocket/tcp/tcpsocket_recv_timeout.cpp
View File

@ -66,8 +66,8 @@ void TCPSOCKET_RECV_TIMEOUT()
TEST_FAIL(); TEST_FAIL();
goto CLEANUP; goto CLEANUP;
} }
printf("MBED: recv() took: %dms\n", timer.read_ms()); printf("MBED: recv() took: %dus\n", timer.read_us());
TEST_ASSERT_INT_WITHIN(50, 150, timer.read_ms()); TEST_ASSERT_INT_WITHIN(51, 150, (timer.read_us() + 500) / 1000);
continue; continue;
} else if (recvd < 0) { } else if (recvd < 0) {
printf("[pkt#%02d] network error %d\n", i, recvd); printf("[pkt#%02d] network error %d\n", i, recvd);

9
TESTS/network/interface/networkinterface_status.cpp
View File

@ -89,7 +89,8 @@ void NETWORKINTERFACE_STATUS()
} }
TEST_ASSERT_EQUAL(NSAPI_STATUS_GLOBAL_UP, status); TEST_ASSERT_EQUAL(NSAPI_STATUS_GLOBAL_UP, status);
net->disconnect(); err = net->disconnect();
TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, err);
status = wait_status_callback(); status = wait_status_callback();
TEST_ASSERT_EQUAL(NSAPI_STATUS_DISCONNECTED, status); TEST_ASSERT_EQUAL(NSAPI_STATUS_DISCONNECTED, status);
@ -123,7 +124,8 @@ void NETWORKINTERFACE_STATUS_NONBLOCK()
} }
TEST_ASSERT_EQUAL(NSAPI_STATUS_GLOBAL_UP, status); TEST_ASSERT_EQUAL(NSAPI_STATUS_GLOBAL_UP, status);
net->disconnect(); err = net->disconnect();
TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, err);
status = wait_status_callback(); status = wait_status_callback();
TEST_ASSERT_EQUAL(NSAPI_STATUS_DISCONNECTED, status); TEST_ASSERT_EQUAL(NSAPI_STATUS_DISCONNECTED, status);
@ -150,7 +152,8 @@ void NETWORKINTERFACE_STATUS_GET()
wait(0.5); wait(0.5);
} }
net->disconnect(); err = net->disconnect();
TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, err);
TEST_ASSERT_EQUAL(NSAPI_STATUS_DISCONNECTED, net->get_connection_status()); TEST_ASSERT_EQUAL(NSAPI_STATUS_DISCONNECTED, net->get_connection_status());
} }