Skip to content

Remove wrong ASSERT from MockOsSysCalls::setsockopt(). #19126

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ggreenway merged 3 commits into from
Nov 30, 2021
+3 −3
Merged

Remove wrong ASSERT from MockOsSysCalls::setsockopt(). #19126

Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5685013
Remove wrong ASSERT from MockOsSysCalls::setsockopt().
efimki Nov 29, 2021
63e9589
Added a condition.
efimki Nov 29, 2021
df0ae77
Kick CI
efimki Nov 30, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions test/mocks/api/mocks.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,14 +60,14 @@ MockOsSysCalls::~MockOsSysCalls() = default;

SysCallIntResult MockOsSysCalls::setsockopt(os_fd_t sockfd, int level, int optname,
const void* optval, socklen_t optlen) {
ASSERT(optlen == sizeof(int));
Comment thread
efimki marked this conversation as resolved.

// Allow mocking system call failure.
if (setsockopt_(sockfd, level, optname, optval, optlen) != 0) {
return SysCallIntResult{-1, 0};
}

boolsockopts_[SockOptKey(sockfd, level, optname)] = !!*reinterpret_cast<const int*>(optval);
if (optlen >= sizeof(int)) {
boolsockopts_[SockOptKey(sockfd, level, optname)] = !!*reinterpret_cast<const int*>(optval);
}
return SysCallIntResult{0, 0};
};

Expand Down