Skip to content

Commit ca57bdd

Browse files
Greentea tests: user-configurable timeouts
Now it is enough to add: "macros": [ "MBED_GREENTEA_TEST_XXXSOCKET_TIMEOUT_S=20" ], to mbed_app.json, where XXX is on of {DNS, TLS, UDP, TCP}. Also network-* tests are now configurable: network-interface, network-wifi, network-emac with a similar macro.
1 parent f2abdcb commit ca57bdd

File tree

8 files changed

+35
-2
lines changed

8 files changed

+35
-2
lines changed

TESTS/netsocket/dns/dns_tests.h

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,14 @@ void hostbyname_cb(void *data, nsapi_error_t result, SocketAddress *address);
6161
void do_asynchronous_gethostbyname(const char hosts[][DNS_TEST_HOST_LEN], unsigned int op_count, int *exp_ok, int *exp_no_mem, int *exp_dns_failure, int *exp_timeout);
6262
void do_gethostbyname(const char hosts[][DNS_TEST_HOST_LEN], unsigned int op_count, int *exp_ok, int *exp_no_mem, int *exp_dns_failure, int *exp_timeout);
6363

64+
namespace dns_global {
65+
#ifdef MBED_GREENTEA_TEST_DNSSOCKET_TIMEOUT_S
66+
static const int TESTS_TIMEOUT = MBED_GREENTEA_TEST_DNSSOCKET_TIMEOUT_S;
67+
#else
68+
static const int TESTS_TIMEOUT = 10 * 60;
69+
#endif
70+
}
71+
6472
/*
6573
* Test cases
6674
*/

TESTS/netsocket/dns/main.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ static void net_bringdown()
166166
// Test setup
167167
utest::v1::status_t test_setup(const size_t number_of_cases)
168168
{
169-
GREENTEA_SETUP(10 * 60, "default_auto");
169+
GREENTEA_SETUP(dns_global::TESTS_TIMEOUT, "default_auto");
170170
net_bringup();
171171
return verbose_test_setup_handler(number_of_cases);
172172
}

TESTS/netsocket/tcp/tcp_tests.h

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,11 @@ int fetch_stats(void);
3636
int split2half_rmng_tcp_test_time(); // [s]
3737

3838
namespace tcp_global {
39+
#ifdef MBED_GREENTEA_TEST_TCPSOCKET_TIMEOUT_S
40+
static const int TESTS_TIMEOUT = MBED_GREENTEA_TEST_TCPSOCKET_TIMEOUT_S;
41+
#else
3942
static const int TESTS_TIMEOUT = (10 * 60);
43+
#endif
4044
static const int TCP_OS_STACK_SIZE = 2048;
4145

4246
static const int RX_BUFF_SIZE = 1220;

TESTS/netsocket/tls/tls_tests.h

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,11 @@ int fetch_stats(void);
3939
int split2half_rmng_tls_test_time(); // [s]
4040

4141
namespace tls_global {
42+
#ifdef MBED_GREENTEA_TEST_TLSSOCKET_TIMEOUT_S
43+
static const int TESTS_TIMEOUT = MBED_GREENTEA_TEST_TLSSOCKET_TIMEOUT_S;
44+
#else
4245
static const int TESTS_TIMEOUT = (10 * 60);
46+
#endif
4347
static const int TLS_OS_STACK_SIZE = 2048;
4448

4549
static const int RX_BUFF_SIZE = 1220;

TESTS/netsocket/udp/udp_tests.h

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,11 @@ int fetch_stats(void);
3434
int split2half_rmng_udp_test_time(); // [s]
3535

3636
namespace udp_global {
37+
#ifdef MBED_GREENTEA_TEST_UDPSOCKET_TIMEOUT_S
38+
static const int TESTS_TIMEOUT = MBED_GREENTEA_TEST_UDPSOCKET_TIMEOUT_S;
39+
#else
3740
static const int TESTS_TIMEOUT = 480;
41+
#endif
3842
}
3943

4044
/*

TESTS/network/emac/main.cpp

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,13 @@ using namespace utest::v1;
5454
utest::v1::status_t test_setup(const size_t number_of_cases)
5555
{
5656
#if !MBED_CONF_APP_ECHO_SERVER
57+
#ifdef MBED_GREENTEA_TEST_EMAC_TIMEOUT_S
58+
GREENTEA_SETUP(MBED_GREENTEA_TEST_EMAC_TIMEOUT_S, "default_auto");
59+
#else
5760
GREENTEA_SETUP(1400, "default_auto");
58-
#endif
61+
#endif // #ifdef MBED_GREENTEA_TEST_EMAC_TIMEOUT_S
62+
#endif // #if !MBED_CONF_APP_ECHO_SERVER
63+
5964
return verbose_test_setup_handler(number_of_cases);
6065
}
6166

TESTS/network/interface/main.cpp

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,11 @@ using namespace utest::v1;
3333
// Test setup
3434
utest::v1::status_t test_setup(const size_t number_of_cases)
3535
{
36+
#ifdef MBED_GREENTEA_TEST_INTERFACE_TIMEOUT_S
37+
GREENTEA_SETUP(MBED_GREENTEA_TEST_INTERFACE_TIMEOUT_S, "default_auto");
38+
#else
3639
GREENTEA_SETUP(480, "default_auto");
40+
#endif
3741
return verbose_test_setup_handler(number_of_cases);
3842
}
3943

TESTS/network/wifi/main.cpp

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,11 @@ using namespace utest::v1;
5252

5353
utest::v1::status_t test_setup(const size_t number_of_cases)
5454
{
55+
#ifdef MBED_GREENTEA_TEST_WIFI_TIMEOUT_S
56+
GREENTEA_SETUP(MBED_GREENTEA_TEST_WIFI_TIMEOUT_S, "default_auto");
57+
#else
5558
GREENTEA_SETUP(360, "default_auto");
59+
#endif
5660
return verbose_test_setup_handler(number_of_cases);
5761
}
5862

0 commit comments

Comments
 (0)