Chromium Code Reviews| Index: native_client_sdk/src/tests/nacl_io_socket_test/socket_test.cc |
| diff --git a/native_client_sdk/src/tests/nacl_io_socket_test/socket_test.cc b/native_client_sdk/src/tests/nacl_io_socket_test/socket_test.cc |
| index fe22ae18e03452aabacf4dee31dd011ebb16d8b9..1ce2c403dc12abdac05ab2a1e8e3f23309b11143 100644 |
| --- a/native_client_sdk/src/tests/nacl_io_socket_test/socket_test.cc |
| +++ b/native_client_sdk/src/tests/nacl_io_socket_test/socket_test.cc |
| @@ -99,6 +99,7 @@ class SocketTestTCP : public SocketTest { |
| } // namespace |
| +#if 0 |
|
binji
2013/09/15 22:18:58
why removed?
noelallen1
2013/09/17 21:21:54
Stale change version.
|
| TEST(SocketTestSimple, Socket) { |
| EXPECT_EQ(-1, socket(AF_UNIX, SOCK_STREAM, 0)); |
| EXPECT_EQ(errno, EAFNOSUPPORT); |
| @@ -140,7 +141,7 @@ TEST_F(SocketTestUDP, Bind) { |
| EXPECT_EQ(Bind(sock2, LOCAL_HOST, PORT1), EINVAL); |
| } |
| - |
| +#endif |
| TEST_F(SocketTestUDP, SendRcv) { |
| char outbuf[256]; |
| char inbuf[512]; |
| @@ -174,8 +175,13 @@ TEST_F(SocketTestUDP, SendRcv) { |
| EXPECT_EQ(0, memcmp(outbuf, inbuf, sizeof(outbuf))); |
| } |
| -#if 0 |
| TEST_F(SocketTestTCP, Connect) { |
| + char outbuf[256]; |
| + char inbuf[512]; |
| + |
| + memset(outbuf, 1, sizeof(outbuf)); |
| + memset(inbuf, 0, sizeof(inbuf)); |
| + |
| int sock = socket(AF_INET, SOCK_STREAM, 0); |
| EXPECT_NE(-1, sock); |
| @@ -184,8 +190,14 @@ TEST_F(SocketTestTCP, Connect) { |
| IP4ToSockAddr(LOCAL_HOST, PORT1, &addr); |
| int err = connect(sock, (sockaddr*) &addr, addrlen); |
| + |
| EXPECT_EQ(ENONE, err) << "Failed with errno: " << errno << "\n"; |
| + |
| + EXPECT_EQ(sizeof(outbuf), write(sock, outbuf, sizeof(outbuf))); |
| + EXPECT_EQ(sizeof(outbuf), read(sock, inbuf, sizeof(inbuf))); |
| + |
| + // Now they should be the same |
| + EXPECT_EQ(0, memcmp(outbuf, inbuf, sizeof(outbuf))); |
| } |
| -#endif |
| #endif // PROVIDES_SOCKETPAIR_API |