From f255132aaddf20103b2b5a72bed361a706895ba6 Mon Sep 17 00:00:00 2001 From: gVisor bot Date: Tue, 15 Mar 2022 13:10:04 -0700 Subject: [PATCH] Internal change. PiperOrigin-RevId: 434836427 --- test/syscalls/linux/tcp_socket.cc | 12 ++++++------ test/syscalls/linux/udp_socket.cc | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/test/syscalls/linux/tcp_socket.cc b/test/syscalls/linux/tcp_socket.cc index 9c0ff8780..7891abea1 100644 --- a/test/syscalls/linux/tcp_socket.cc +++ b/test/syscalls/linux/tcp_socket.cc @@ -1043,8 +1043,8 @@ TEST_P(SimpleTcpSocketTest, NonBlockingConnectNoListener) { ASSERT_NO_ERRNO_AND_VALUE(InetLoopbackAddr(GetParam())); socklen_t addrlen = sizeof(addr); - const FileDescriptor s = - nonBlockingConnectNoListener(GetParam(), addr, addrlen).ValueOrDie(); + const FileDescriptor s = ASSERT_NO_ERRNO_AND_VALUE( + nonBlockingConnectNoListener(GetParam(), addr, addrlen)); int err; socklen_t optlen = sizeof(err); @@ -1069,8 +1069,8 @@ TEST_P(SimpleTcpSocketTest, NonBlockingConnectNoListenerRead) { ASSERT_NO_ERRNO_AND_VALUE(InetLoopbackAddr(GetParam())); socklen_t addrlen = sizeof(addr); - const FileDescriptor s = - nonBlockingConnectNoListener(GetParam(), addr, addrlen).ValueOrDie(); + const FileDescriptor s = ASSERT_NO_ERRNO_AND_VALUE( + nonBlockingConnectNoListener(GetParam(), addr, addrlen)); unsigned char c; ASSERT_THAT(read(s.get(), &c, 1), SyscallFailsWithErrno(ECONNREFUSED)); @@ -1084,8 +1084,8 @@ TEST_P(SimpleTcpSocketTest, NonBlockingConnectNoListenerPeek) { ASSERT_NO_ERRNO_AND_VALUE(InetLoopbackAddr(GetParam())); socklen_t addrlen = sizeof(addr); - const FileDescriptor s = - nonBlockingConnectNoListener(GetParam(), addr, addrlen).ValueOrDie(); + const FileDescriptor s = ASSERT_NO_ERRNO_AND_VALUE( + nonBlockingConnectNoListener(GetParam(), addr, addrlen)); unsigned char c; ASSERT_THAT(recv(s.get(), &c, 1, MSG_PEEK), diff --git a/test/syscalls/linux/udp_socket.cc b/test/syscalls/linux/udp_socket.cc index a1265ec36..f126467c0 100644 --- a/test/syscalls/linux/udp_socket.cc +++ b/test/syscalls/linux/udp_socket.cc @@ -551,7 +551,7 @@ TEST_P(UdpSocketTest, DisconnectAfterConnectAnyWithPort) { struct sockaddr_storage addr; socklen_t addrlen = sizeof(addr); - EXPECT_THAT(getpeername(sock_.get(), AsSockAddr(&addr), &addrlen), + ASSERT_THAT(getpeername(sock_.get(), AsSockAddr(&addr), &addrlen), SyscallSucceeds()); EXPECT_EQ(addrlen, addrlen_);