Internal change.

PiperOrigin-RevId: 434836427
This commit is contained in:
gVisor bot 2022-03-15 13:10:04 -07:00
parent dddbb7d7a9
commit f255132aad
2 changed files with 7 additions and 7 deletions

View File

@ -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),

View File

@ -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_);