From 595e4870a7099b8fe1eaced3cc6c45061b17acda Mon Sep 17 00:00:00 2001 From: Michal Paszta Date: Thu, 20 Dec 2018 15:31:05 +0100 Subject: [PATCH] Greentea tests ignore bind returning UNSUPPORTED --- TESTS/netsocket/tcp/tcpsocket_bind_address.cpp | 7 ++++++- TESTS/netsocket/tcp/tcpsocket_bind_address_invalid.cpp | 7 ++++++- TESTS/netsocket/tcp/tcpsocket_bind_address_null.cpp | 7 ++++++- TESTS/netsocket/tcp/tcpsocket_bind_address_port.cpp | 7 ++++++- TESTS/netsocket/tcp/tcpsocket_bind_port.cpp | 7 ++++++- TESTS/netsocket/tcp/tcpsocket_bind_port_fail.cpp | 9 ++++++++- TESTS/netsocket/tcp/tcpsocket_bind_unopened.cpp | 7 ++++++- TESTS/netsocket/tcp/tcpsocket_bind_wrong_type.cpp | 7 ++++++- TESTS/netsocket/udp/udpsocket_bind_address.cpp | 7 ++++++- TESTS/netsocket/udp/udpsocket_bind_address_invalid.cpp | 7 ++++++- TESTS/netsocket/udp/udpsocket_bind_address_null.cpp | 7 ++++++- TESTS/netsocket/udp/udpsocket_bind_address_port.cpp | 7 ++++++- TESTS/netsocket/udp/udpsocket_bind_port.cpp | 7 ++++++- TESTS/netsocket/udp/udpsocket_bind_port_fail.cpp | 9 ++++++++- TESTS/netsocket/udp/udpsocket_bind_unopened.cpp | 7 ++++++- TESTS/netsocket/udp/udpsocket_bind_wrong_type.cpp | 7 ++++++- 16 files changed, 100 insertions(+), 16 deletions(-) diff --git a/TESTS/netsocket/tcp/tcpsocket_bind_address.cpp b/TESTS/netsocket/tcp/tcpsocket_bind_address.cpp index 6101425b72..a606c54c61 100644 --- a/TESTS/netsocket/tcp/tcpsocket_bind_address.cpp +++ b/TESTS/netsocket/tcp/tcpsocket_bind_address.cpp @@ -39,7 +39,12 @@ void TCPSOCKET_BIND_ADDRESS() } TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, sock->open(get_interface())); SocketAddress sockAddr = SocketAddress(get_interface()->get_ip_address(), 80); - TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, sock->bind(sockAddr)); + nsapi_error_t bind_result = sock->bind(sockAddr); + if (bind_result == NSAPI_ERROR_UNSUPPORTED) { + TEST_IGNORE_MESSAGE("bind() not supported"); + } else { + TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, bind_result); + } delete sock; diff --git a/TESTS/netsocket/tcp/tcpsocket_bind_address_invalid.cpp b/TESTS/netsocket/tcp/tcpsocket_bind_address_invalid.cpp index 971499d991..77c5ca73f2 100644 --- a/TESTS/netsocket/tcp/tcpsocket_bind_address_invalid.cpp +++ b/TESTS/netsocket/tcp/tcpsocket_bind_address_invalid.cpp @@ -38,7 +38,12 @@ void TCPSOCKET_BIND_ADDRESS_INVALID() TEST_FAIL(); } TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, sock->open(get_interface())); - TEST_ASSERT_EQUAL(NSAPI_ERROR_PARAMETER, sock->bind("190.2.3.4", 1024)); + nsapi_error_t bind_result = sock->bind("190.2.3.4", 1024); + if (bind_result == NSAPI_ERROR_UNSUPPORTED) { + TEST_IGNORE_MESSAGE("bind() not supported"); + } else { + TEST_ASSERT_EQUAL(NSAPI_ERROR_PARAMETER, bind_result); + } delete sock; diff --git a/TESTS/netsocket/tcp/tcpsocket_bind_address_null.cpp b/TESTS/netsocket/tcp/tcpsocket_bind_address_null.cpp index e31d757f7f..e838e2792d 100644 --- a/TESTS/netsocket/tcp/tcpsocket_bind_address_null.cpp +++ b/TESTS/netsocket/tcp/tcpsocket_bind_address_null.cpp @@ -38,7 +38,12 @@ void TCPSOCKET_BIND_ADDRESS_NULL() TEST_FAIL(); } TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, sock->open(get_interface())); - TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, sock->bind(NULL, 1024)); + nsapi_error_t bind_result = sock->bind(NULL, 1024); + if (bind_result == NSAPI_ERROR_UNSUPPORTED) { + TEST_IGNORE_MESSAGE("bind() not supported"); + } else { + TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, bind_result); + } delete sock; diff --git a/TESTS/netsocket/tcp/tcpsocket_bind_address_port.cpp b/TESTS/netsocket/tcp/tcpsocket_bind_address_port.cpp index 25a7c52ffc..ee60fc0caf 100644 --- a/TESTS/netsocket/tcp/tcpsocket_bind_address_port.cpp +++ b/TESTS/netsocket/tcp/tcpsocket_bind_address_port.cpp @@ -38,7 +38,12 @@ void TCPSOCKET_BIND_ADDRESS_PORT() TEST_FAIL(); } TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, sock->open(get_interface())); - TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, sock->bind(get_interface()->get_ip_address(), 80)); + nsapi_error_t bind_result = sock->bind(get_interface()->get_ip_address(), 80); + if (bind_result == NSAPI_ERROR_UNSUPPORTED) { + TEST_IGNORE_MESSAGE("bind() not supported"); + } else { + TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, bind_result); + } delete sock; diff --git a/TESTS/netsocket/tcp/tcpsocket_bind_port.cpp b/TESTS/netsocket/tcp/tcpsocket_bind_port.cpp index 862879cf56..4fd75370de 100644 --- a/TESTS/netsocket/tcp/tcpsocket_bind_port.cpp +++ b/TESTS/netsocket/tcp/tcpsocket_bind_port.cpp @@ -38,7 +38,12 @@ void TCPSOCKET_BIND_PORT() TEST_FAIL(); } TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, sock->open(get_interface())); - TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, sock->bind(1024)); + nsapi_error_t bind_result = sock->bind(1024); + if (bind_result == NSAPI_ERROR_UNSUPPORTED) { + TEST_IGNORE_MESSAGE("bind() not supported"); + } else { + TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, bind_result); + } delete sock; diff --git a/TESTS/netsocket/tcp/tcpsocket_bind_port_fail.cpp b/TESTS/netsocket/tcp/tcpsocket_bind_port_fail.cpp index 96fee05e37..2fd8beb312 100644 --- a/TESTS/netsocket/tcp/tcpsocket_bind_port_fail.cpp +++ b/TESTS/netsocket/tcp/tcpsocket_bind_port_fail.cpp @@ -38,7 +38,14 @@ void TCPSOCKET_BIND_PORT_FAIL() TEST_FAIL(); } TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, sock->open(get_interface())); - TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, sock->bind(1024)); + nsapi_error_t bind_result = sock->bind(1024); + if (bind_result == NSAPI_ERROR_UNSUPPORTED) { + TEST_IGNORE_MESSAGE("bind() not supported"); + delete sock; + return; + } else { + TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, bind_result); + } TCPSocket *sock2 = new TCPSocket; if (!sock2) { diff --git a/TESTS/netsocket/tcp/tcpsocket_bind_unopened.cpp b/TESTS/netsocket/tcp/tcpsocket_bind_unopened.cpp index c15743160f..daa66adff5 100644 --- a/TESTS/netsocket/tcp/tcpsocket_bind_unopened.cpp +++ b/TESTS/netsocket/tcp/tcpsocket_bind_unopened.cpp @@ -37,7 +37,12 @@ void TCPSOCKET_BIND_UNOPENED() if (!sock) { TEST_FAIL(); } - TEST_ASSERT_EQUAL(NSAPI_ERROR_NO_SOCKET, sock->bind(1024)); + nsapi_error_t bind_result = sock->bind(1024); + if (bind_result == NSAPI_ERROR_UNSUPPORTED) { + TEST_IGNORE_MESSAGE("bind() not supported"); + } else { + TEST_ASSERT_EQUAL(NSAPI_ERROR_NO_SOCKET, bind_result); + } delete sock; diff --git a/TESTS/netsocket/tcp/tcpsocket_bind_wrong_type.cpp b/TESTS/netsocket/tcp/tcpsocket_bind_wrong_type.cpp index b22b688043..11b172255d 100644 --- a/TESTS/netsocket/tcp/tcpsocket_bind_wrong_type.cpp +++ b/TESTS/netsocket/tcp/tcpsocket_bind_wrong_type.cpp @@ -40,7 +40,12 @@ void TCPSOCKET_BIND_WRONG_TYPE() TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, sock->open(get_interface())); char addr_bytes[16] = {0xfe, 0x80, 0xff, 0x1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}; SocketAddress sockAddr = SocketAddress(addr_bytes, NSAPI_IPv4, 80); - TEST_ASSERT_EQUAL(NSAPI_ERROR_PARAMETER, sock->bind(sockAddr)); + nsapi_error_t bind_result = sock->bind(sockAddr); + if (bind_result == NSAPI_ERROR_UNSUPPORTED) { + TEST_IGNORE_MESSAGE("bind() not supported"); + } else { + TEST_ASSERT_EQUAL(NSAPI_ERROR_PARAMETER, bind_result); + } delete sock; diff --git a/TESTS/netsocket/udp/udpsocket_bind_address.cpp b/TESTS/netsocket/udp/udpsocket_bind_address.cpp index 139c98ea51..2405e8c918 100644 --- a/TESTS/netsocket/udp/udpsocket_bind_address.cpp +++ b/TESTS/netsocket/udp/udpsocket_bind_address.cpp @@ -39,7 +39,12 @@ void UDPSOCKET_BIND_ADDRESS() } TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, sock->open(get_interface())); SocketAddress sockAddr = SocketAddress(get_interface()->get_ip_address(), 80); - TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, sock->bind(sockAddr)); + nsapi_error_t bind_result = sock->bind(sockAddr); + if (bind_result == NSAPI_ERROR_UNSUPPORTED) { + TEST_IGNORE_MESSAGE("bind() not supported"); + } else { + TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, bind_result); + } delete sock; diff --git a/TESTS/netsocket/udp/udpsocket_bind_address_invalid.cpp b/TESTS/netsocket/udp/udpsocket_bind_address_invalid.cpp index 33a29f12d2..49ad3eb32d 100644 --- a/TESTS/netsocket/udp/udpsocket_bind_address_invalid.cpp +++ b/TESTS/netsocket/udp/udpsocket_bind_address_invalid.cpp @@ -38,7 +38,12 @@ void UDPSOCKET_BIND_ADDRESS_INVALID() TEST_FAIL(); } TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, sock->open(get_interface())); - TEST_ASSERT_EQUAL(NSAPI_ERROR_PARAMETER, sock->bind("190.2.3.4", 1024)); + nsapi_error_t bind_result = sock->bind("190.2.3.4", 1024); + if (bind_result == NSAPI_ERROR_UNSUPPORTED) { + TEST_IGNORE_MESSAGE("bind() not supported"); + } else { + TEST_ASSERT_EQUAL(NSAPI_ERROR_PARAMETER, bind_result); + } delete sock; diff --git a/TESTS/netsocket/udp/udpsocket_bind_address_null.cpp b/TESTS/netsocket/udp/udpsocket_bind_address_null.cpp index addacb1126..ee8616bce4 100644 --- a/TESTS/netsocket/udp/udpsocket_bind_address_null.cpp +++ b/TESTS/netsocket/udp/udpsocket_bind_address_null.cpp @@ -38,7 +38,12 @@ void UDPSOCKET_BIND_ADDRESS_NULL() TEST_FAIL(); } TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, sock->open(get_interface())); - TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, sock->bind(NULL, 1024)); + nsapi_error_t bind_result = sock->bind(NULL, 1024); + if (bind_result == NSAPI_ERROR_UNSUPPORTED) { + TEST_IGNORE_MESSAGE("bind() not supported"); + } else { + TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, bind_result); + } delete sock; diff --git a/TESTS/netsocket/udp/udpsocket_bind_address_port.cpp b/TESTS/netsocket/udp/udpsocket_bind_address_port.cpp index 633f887c31..503be63de5 100644 --- a/TESTS/netsocket/udp/udpsocket_bind_address_port.cpp +++ b/TESTS/netsocket/udp/udpsocket_bind_address_port.cpp @@ -38,7 +38,12 @@ void UDPSOCKET_BIND_ADDRESS_PORT() TEST_FAIL(); } TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, sock->open(get_interface())); - TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, sock->bind(get_interface()->get_ip_address(), 80)); + nsapi_error_t bind_result = sock->bind(get_interface()->get_ip_address(), 80); + if (bind_result == NSAPI_ERROR_UNSUPPORTED) { + TEST_IGNORE_MESSAGE("bind() not supported"); + } else { + TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, bind_result); + } delete sock; diff --git a/TESTS/netsocket/udp/udpsocket_bind_port.cpp b/TESTS/netsocket/udp/udpsocket_bind_port.cpp index fbe98e45ee..54290ec0dc 100644 --- a/TESTS/netsocket/udp/udpsocket_bind_port.cpp +++ b/TESTS/netsocket/udp/udpsocket_bind_port.cpp @@ -38,7 +38,12 @@ void UDPSOCKET_BIND_PORT() TEST_FAIL(); } TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, sock->open(get_interface())); - TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, sock->bind(1024)); + nsapi_error_t bind_result = sock->bind(1024); + if (bind_result == NSAPI_ERROR_UNSUPPORTED) { + TEST_IGNORE_MESSAGE("bind() not supported"); + } else { + TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, bind_result); + } delete sock; diff --git a/TESTS/netsocket/udp/udpsocket_bind_port_fail.cpp b/TESTS/netsocket/udp/udpsocket_bind_port_fail.cpp index 81ebfda069..e39d3b26b2 100644 --- a/TESTS/netsocket/udp/udpsocket_bind_port_fail.cpp +++ b/TESTS/netsocket/udp/udpsocket_bind_port_fail.cpp @@ -38,7 +38,14 @@ void UDPSOCKET_BIND_PORT_FAIL() TEST_FAIL(); } TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, sock->open(get_interface())); - TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, sock->bind(1024)); + nsapi_error_t bind_result = sock->bind(1024); + if (bind_result == NSAPI_ERROR_UNSUPPORTED) { + TEST_IGNORE_MESSAGE("bind() not supported"); + delete sock; + return; + } else { + TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, bind_result); + } UDPSocket *sock2 = new UDPSocket; if (!sock2) { diff --git a/TESTS/netsocket/udp/udpsocket_bind_unopened.cpp b/TESTS/netsocket/udp/udpsocket_bind_unopened.cpp index aca434c7e4..fcd4703395 100644 --- a/TESTS/netsocket/udp/udpsocket_bind_unopened.cpp +++ b/TESTS/netsocket/udp/udpsocket_bind_unopened.cpp @@ -37,7 +37,12 @@ void UDPSOCKET_BIND_UNOPENED() if (!sock) { TEST_FAIL(); } - TEST_ASSERT_EQUAL(NSAPI_ERROR_NO_SOCKET, sock->bind(1024)); + nsapi_error_t bind_result = sock->bind(1024); + if (bind_result == NSAPI_ERROR_UNSUPPORTED) { + TEST_IGNORE_MESSAGE("bind() not supported"); + } else { + TEST_ASSERT_EQUAL(NSAPI_ERROR_NO_SOCKET, bind_result); + } delete sock; diff --git a/TESTS/netsocket/udp/udpsocket_bind_wrong_type.cpp b/TESTS/netsocket/udp/udpsocket_bind_wrong_type.cpp index 11836666e9..9a27c1f410 100644 --- a/TESTS/netsocket/udp/udpsocket_bind_wrong_type.cpp +++ b/TESTS/netsocket/udp/udpsocket_bind_wrong_type.cpp @@ -40,7 +40,12 @@ void UDPSOCKET_BIND_WRONG_TYPE() TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, sock->open(get_interface())); char addr_bytes[16] = {0xfe, 0x80, 0xff, 0x1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}; SocketAddress sockAddr = SocketAddress(addr_bytes, NSAPI_IPv4, 80); - TEST_ASSERT_EQUAL(NSAPI_ERROR_PARAMETER, sock->bind(sockAddr)); + nsapi_error_t bind_result = sock->bind(sockAddr); + if (bind_result == NSAPI_ERROR_UNSUPPORTED) { + TEST_IGNORE_MESSAGE("bind() not supported"); + } else { + TEST_ASSERT_EQUAL(NSAPI_ERROR_PARAMETER, bind_result); + } delete sock;