Skip to content

connection: Add TCP_FASTOPEN listener option (continuation) #3157

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
htuch merged 2 commits into from
Apr 25, 2018
Merged

connection: Add TCP_FASTOPEN listener option (continuation) #3157

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6e23b12
rename socket_option_test_harness to socket_option_test
bmetzdorf Apr 20, 2018
b30e906
use EXPECT_THROW_WITH_MESSAGE in SetListeningSocketOptionsError test
bmetzdorf Apr 20, 2018
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/common/network/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,8 +154,8 @@ envoy_cc_test(
)

envoy_cc_test_library(
name = "socket_option_test_harness",
srcs = ["socket_option_test_harness.h"],
name = "socket_option_test",
srcs = ["socket_option_test.h"],
deps = [
"//source/common/network:address_lib",
"//source/common/network:socket_option_lib",
Expand All @@ -171,7 +171,7 @@ envoy_cc_test(
name = "socket_option_impl_test",
srcs = ["socket_option_impl_test.cc"],
deps = [
":socket_option_test_harness",
":socket_option_test",
],
)

Expand Down
6 changes: 4 additions & 2 deletions test/common/network/listener_impl_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,8 +111,10 @@ TEST_P(ListenerImplTest, SetListeningSocketOptionsError) {
std::shared_ptr<MockSocketOption> option = std::make_shared<MockSocketOption>();
socket.addOption(option);
EXPECT_CALL(*option, setOption(_, Socket::SocketState::Listening)).WillOnce(Return(false));
EXPECT_THROW(TestListenerImpl(dispatcher, socket, listener_callbacks, true, false),
CreateListenerException);
EXPECT_THROW_WITH_MESSAGE(TestListenerImpl(dispatcher, socket, listener_callbacks, true, false),
CreateListenerException,
fmt::format("cannot set post-listen socket option on socket: {}",
socket.localAddress()->asString()));
}

TEST_P(ListenerImplTest, UseActualDst) {
Expand Down
4 changes: 2 additions & 2 deletions test/common/network/socket_option_impl_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
#include "test/common/network/socket_option_test_harness.h"
#include "test/common/network/socket_option_test.h"

namespace Envoy {
namespace Network {
namespace {

class SocketOptionImplTest : public SocketOptionTestHarness {};
class SocketOptionImplTest : public SocketOptionTest {};

// We fail to set the option if the socket FD is bad.
TEST_F(SocketOptionImplTest, BadFd) {
Expand Down
4 changes: 2 additions & 2 deletions ...mmon/network/socket_option_test_harness.h → test/common/network/socket_option_test.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ namespace Envoy {
namespace Network {
namespace {

class SocketOptionTestHarness : public testing::Test {
class SocketOptionTest : public testing::Test {
public:
SocketOptionTestHarness() { socket_.local_address_.reset(); }
SocketOptionTest() { socket_.local_address_.reset(); }

NiceMock<MockListenSocket> socket_;
Api::MockOsSysCalls os_sys_calls_;
Expand Down
2 changes: 1 addition & 1 deletion test/server/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@ envoy_cc_test(
srcs = ["listener_socket_option_impl_test.cc"],
deps = [
"//source/server:listener_socket_option_lib",
"//test/common/network:socket_option_test_harness",
"//test/common/network:socket_option_test",
],
)

Expand Down
8 changes: 4 additions & 4 deletions test/server/listener_socket_option_impl_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
#include "server/listener_socket_option_impl.h"

#include "test/common/network/socket_option_test_harness.h"
#include "test/common/network/socket_option_test.h"

namespace Envoy {
namespace Server {

class ListenerSocketOptionImplTest : public Network::SocketOptionTestHarness {
class ListenerSocketOptionImplTest : public Network::SocketOptionTest {
public:
void testSetSocketOptionSuccess(ListenerSocketOptionImpl& socket_option, int socket_level,
Network::SocketOptionName option_name, int option_val,
const std::set<Network::Socket::SocketState>& when) {
Network::SocketOptionTestHarness::testSetSocketOptionSuccess(socket_option, socket_level,
option_name, option_val, when);
Network::SocketOptionTest::testSetSocketOptionSuccess(socket_option, socket_level, option_name,
option_val, when);
}
};

Expand Down