netbird/gvisor
0
0
Fork 0
mirror of https://github.com/netbirdio/gvisor.git synced 2026-05-22 17:12:49 -07:00
Code Issues Packages Projects Releases Wiki Activity

Work around missing signal in Fuchsia

Browse Source 
Narrow the Fuchsia non-compliance rather than expecting the test to fail.

PiperOrigin-RevId: 460500478
This commit is contained in:
Tamir Duberstein
2022-07-12 10:45:21 -07:00
committed by gVisor bot
parent dfd9045221
commit 81c6ae3dd5
1 changed files with 26 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/syscalls/linux/tcp_socket.cc
+26 -12
View File
@@ -2305,7 +2305,13 @@ TEST_P(SimpleTcpSocketTest, SynRcvdOnListenerShutdown) {
ASSERT_EQ(optlen, sizeof(err));
if (err == 0) {
EXPECT_EQ(poll_fd.revents, POLLOUT | POLLWRNORM);
EXPECT_EQ(poll_fd.revents, POLLOUT
// TODO(https://fxbug.dev/73258): Remove when POLLWRNORM is correctly
// asserted in Fuchsia.
#if !defined(__Fuchsia__)
| POLLWRNORM
#endif
);
} else {
EXPECT_THAT(err, ::testing::AnyOf(::testing::Eq(ECONNRESET),
::testing::Eq(ECONNREFUSED)))
@@ -2318,17 +2324,25 @@ TEST_P(SimpleTcpSocketTest, SynRcvdOnListenerShutdown) {
EXPECT_THAT(RetryEINTR(poll)(&poll_fd, 1, 0),
SyscallSucceedsWithValue(1));
EXPECT_EQ(poll_fd.revents, []() {
const int expected_revents =
POLLIN | POLLOUT | POLLHUP | POLLRDNORM | POLLWRNORM;
// TODO(gvisor.dev/issue/6666): POLLERR is still present after
// getsockopt(..., SO_ERROR, ...) call.
if (IsRunningOnGvisor()) {
return expected_revents | POLLPRI | POLLERR;
} else {
return expected_revents | POLLRDHUP;
}
}());
EXPECT_EQ(poll_fd.revents,
// TODO(https://fxbug.dev/76353): Remove when other signals are asserted
// together with POLLERR in Fuchsia.
#if defined(__Fuchsia__)
POLLOUT
#else
[]() {
const int expected_revents =
POLLIN | POLLOUT | POLLHUP | POLLRDNORM | POLLWRNORM;
// TODO(gvisor.dev/issue/6666): POLLERR is still present
// after getsockopt(..., SO_ERROR, ...) call.
if (IsRunningOnGvisor()) {
return expected_revents | POLLPRI | POLLERR;
} else {
return expected_revents | POLLRDHUP;
}
}()
#endif
);
EXPECT_THAT(
revents,