diff --git a/test/integration/uds_integration_test.h b/test/integration/uds_integration_test.h index 2905ce29e365..84251b09b174 100644 --- a/test/integration/uds_integration_test.h +++ b/test/integration/uds_integration_test.h @@ -14,6 +14,15 @@ #include "gtest/gtest.h" namespace Envoy { + +std::string udsSocketName(const std::string& path, bool abstract_namespace) { + const std::string name = TestEnvironment::unixDomainSocketPath(path); + if (!abstract_namespace) { + return name; + } + return "@" + name; +} + class UdsUpstreamIntegrationTest : public HttpIntegrationTest, public testing::TestWithParam> { @@ -23,8 +32,8 @@ class UdsUpstreamIntegrationTest abstract_namespace_(std::get<1>(GetParam())) {} void createUpstreams() override { - fake_upstreams_.emplace_back( - new FakeUpstream(getSocketName(), FakeHttpConnection::Type::HTTP1)); + fake_upstreams_.emplace_back(new FakeUpstream( + udsSocketName("udstest.1.sock", abstract_namespace_), FakeHttpConnection::Type::HTTP1)); config_helper_.addConfigModifier( [&](envoy::config::bootstrap::v2::Bootstrap& bootstrap) -> void { @@ -33,17 +42,13 @@ class UdsUpstreamIntegrationTest auto* cluster = static_resources->mutable_clusters(i); for (int j = 0; j < cluster->hosts_size(); ++j) { cluster->mutable_hosts(j)->clear_socket_address(); - cluster->mutable_hosts(j)->mutable_pipe()->set_path(getSocketName()); + cluster->mutable_hosts(j)->mutable_pipe()->set_path( + udsSocketName("udstest.1.sock", abstract_namespace_)); } } }); } - std::string getSocketName() { - return abstract_namespace_ ? "@/my/udstest" - : TestEnvironment::unixDomainSocketPath("udstest.1.sock"); - } - protected: const bool abstract_namespace_; }; @@ -58,17 +63,11 @@ class UdsListenerIntegrationTest void initialize() override; - std::string getSocketName(const std::string& path) { - const std::string name = TestEnvironment::unixDomainSocketPath(path); - if (!abstract_namespace_) { - return name; - } - return "@" + name; - } - - std::string getAdminSocketName() { return getSocketName("admin.sock"); } + std::string getAdminSocketName() { return udsSocketName("admin.sock", abstract_namespace_); } - std::string getListenerSocketName() { return getSocketName("listener_0.sock"); } + std::string getListenerSocketName() { + return udsSocketName("listener_0.sock", abstract_namespace_); + } protected: HttpIntegrationTest::ConnectionCreationFunction createConnectionFn();