From 7dc68229ed4b246618455628bd608a74e3d9ad71 Mon Sep 17 00:00:00 2001 From: Randy Smith Date: Wed, 30 Jan 2019 16:05:08 -0500 Subject: [PATCH 1/6] Modified docs and variable names Signed-off-by: Randy Smith --- test/integration/integration.cc | 6 +++--- test/integration/integration.h | 8 +++++--- test/integration/server.cc | 13 ++++++++----- test/integration/server.h | 4 ++-- 4 files changed, 18 insertions(+), 13 deletions(-) diff --git a/test/integration/integration.cc b/test/integration/integration.cc index bc4651912e7fe..2c1e8296e2495 100644 --- a/test/integration/integration.cc +++ b/test/integration/integration.cc @@ -358,7 +358,7 @@ void BaseIntegrationTest::registerTestServerPorts(const std::vector void BaseIntegrationTest::createGeneratedApiTestServer(const std::string& bootstrap_path, const std::vector& port_names) { test_server_ = IntegrationTestServer::create(bootstrap_path, version_, - pre_worker_start_test_steps_, deterministic_, + server_init_coroutines_, deterministic_, *time_system_, *api_, defer_listener_finalization_); if (config_helper_.bootstrap().static_resources().listeners_size() > 0 && !defer_listener_finalization_) { @@ -413,9 +413,9 @@ void BaseIntegrationTest::sendRawHttpAndWaitForResponse(int port, const char* ra IntegrationTestServerPtr BaseIntegrationTest::createIntegrationTestServer(const std::string& bootstrap_path, - std::function pre_worker_start_test_steps, + std::function server_init_coroutines, Event::TestTimeSystem& time_system) { - return IntegrationTestServer::create(bootstrap_path, version_, pre_worker_start_test_steps, + return IntegrationTestServer::create(bootstrap_path, version_, server_init_coroutines, deterministic_, time_system, *api_, defer_listener_finalization_); } diff --git a/test/integration/integration.h b/test/integration/integration.h index 6fb83ac99ad4d..7a9b4fba8142e 100644 --- a/test/integration/integration.h +++ b/test/integration/integration.h @@ -211,7 +211,7 @@ class BaseIntegrationTest : Logger::Loggable { // Will not return until that server is listening. virtual IntegrationTestServerPtr createIntegrationTestServer(const std::string& bootstrap_path, - std::function pre_worker_start_steps, + std::function server_init_coroutines, Event::TestTimeSystem& time_system); bool initialized() const { return initialized_; } @@ -220,8 +220,10 @@ class BaseIntegrationTest : Logger::Loggable { Network::Address::IpVersion version_; // The config for envoy start-up. ConfigHelper config_helper_; - // Steps that should be done prior to the workers starting. E.g., xDS pre-init. - std::function pre_worker_start_test_steps_; + + // Steps that should be done in parallel with the envoy server starting. E.g., xDS + // pre-init, control plane synchronization needed for server start. + std::function server_init_coroutines_; std::vector> fake_upstreams_; // Target number of upstreams. diff --git a/test/integration/server.cc b/test/integration/server.cc index 94ae3ee696bbb..8edfae58f885a 100644 --- a/test/integration/server.cc +++ b/test/integration/server.cc @@ -46,11 +46,11 @@ OptionsImpl createTestOptionsImpl(const std::string& config_path, const std::str IntegrationTestServerPtr IntegrationTestServer::create( const std::string& config_path, const Network::Address::IpVersion version, - std::function pre_worker_start_test_steps, bool deterministic, + std::function server_init_coroutines, bool deterministic, Event::TestTimeSystem& time_system, Api::Api& api, bool defer_listener_finalization) { IntegrationTestServerPtr server{ std::make_unique(time_system, api, config_path)}; - server->start(version, pre_worker_start_test_steps, deterministic, defer_listener_finalization); + server->start(version, server_init_coroutines, deterministic, defer_listener_finalization); return server; } @@ -65,7 +65,7 @@ void IntegrationTestServer::waitUntilListenersReady() { } void IntegrationTestServer::start(const Network::Address::IpVersion version, - std::function pre_worker_start_test_steps, + std::function server_init_coroutines, bool deterministic, bool defer_listener_finalization) { ENVOY_LOG(info, "starting integration test server"); ASSERT(!thread_); @@ -73,8 +73,11 @@ void IntegrationTestServer::start(const Network::Address::IpVersion version, [version, deterministic, this]() -> void { threadRoutine(version, deterministic); }); // If any steps need to be done prior to workers starting, do them now. E.g., xDS pre-init. - if (pre_worker_start_test_steps != nullptr) { - pre_worker_start_test_steps(); + // Note that there is no synchronization guaranteeing this happens either + // before workers starting or after server start. Any needed synchornization must occur in the routines. + // These steps are executed at this point in the code to allow server initialization to be dependent on them (e.g. control plane peers). + if (server_init_coroutines != nullptr) { + server_init_coroutines(); } // Wait for the server to be created and the number of initial listeners to wait for to be set. diff --git a/test/integration/server.h b/test/integration/server.h index ca03050c9b97d..a99fda0d7963a 100644 --- a/test/integration/server.h +++ b/test/integration/server.h @@ -174,7 +174,7 @@ class IntegrationTestServer : public Logger::Loggable, public: static IntegrationTestServerPtr create(const std::string& config_path, const Network::Address::IpVersion version, - std::function pre_worker_start_test_steps, + std::function server_init_coroutines, bool deterministic, Event::TestTimeSystem& time_system, Api::Api& api, bool defer_listener_finalization = false); // Note that the derived class is responsible for tearing down the server in its @@ -191,7 +191,7 @@ class IntegrationTestServer : public Logger::Loggable, on_worker_listener_removed_cb_ = on_worker_listener_removed; } void start(const Network::Address::IpVersion version, - std::function pre_worker_start_test_steps, bool deterministic, + std::function server_init_coroutines, bool deterministic, bool defer_listener_finalization); void waitForCounterGe(const std::string& name, uint64_t value) override { From 330480a0b7c0df233b628dcd50e2d6c6ae8b7fc9 Mon Sep 17 00:00:00 2001 From: Randy Smith Date: Thu, 31 Jan 2019 13:38:16 -0500 Subject: [PATCH 2/6] Changed name in a couple of neglected files Signed-off-by: Randy Smith --- test/integration/ads_integration_test.cc | 2 +- test/integration/header_integration_test.cc | 2 +- test/integration/sds_dynamic_integration_test.cc | 12 ++++++------ 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/test/integration/ads_integration_test.cc b/test/integration/ads_integration_test.cc index e872ad6770a50..ee042f3ce592c 100644 --- a/test/integration/ads_integration_test.cc +++ b/test/integration/ads_integration_test.cc @@ -678,7 +678,7 @@ TEST_P(AdsIntegrationTest, XdsBatching) { static_resources->add_listeners()->MergeFrom(buildListener("rds_listener2", "route_config2")); }); - pre_worker_start_test_steps_ = [this]() { + server_init_coroutines_ = [this]() { createXdsConnection(*fake_upstreams_.back()); ASSERT_TRUE(xds_connection_->waitForNewStream(*dispatcher_, xds_stream_)); xds_stream_->startGrpcStream(); diff --git a/test/integration/header_integration_test.cc b/test/integration/header_integration_test.cc index 92b18f43a6cb7..274debc292c2c 100644 --- a/test/integration/header_integration_test.cc +++ b/test/integration/header_integration_test.cc @@ -339,7 +339,7 @@ class HeaderIntegrationTest void initialize() override { if (use_eds_) { - pre_worker_start_test_steps_ = [this]() { + server_init_coroutines_ = [this]() { AssertionResult result = fake_upstreams_[1]->waitForHttpConnection(*dispatcher_, eds_connection_); RELEASE_ASSERT(result, result.message()); diff --git a/test/integration/sds_dynamic_integration_test.cc b/test/integration/sds_dynamic_integration_test.cc index a261adee3dd3e..feb8a166fbfd4 100644 --- a/test/integration/sds_dynamic_integration_test.cc +++ b/test/integration/sds_dynamic_integration_test.cc @@ -219,7 +219,7 @@ INSTANTIATE_TEST_CASE_P(IpVersionsClientType, SdsDynamicDownstreamIntegrationTes // A test that SDS server send a good server secret for a static listener. // The first ssl request should be OK. TEST_P(SdsDynamicDownstreamIntegrationTest, BasicSuccess) { - pre_worker_start_test_steps_ = [this]() { + server_init_coroutines_ = [this]() { createSdsStream(*(fake_upstreams_[1])); sendSdsResponse(getServerSecret()); }; @@ -235,7 +235,7 @@ TEST_P(SdsDynamicDownstreamIntegrationTest, BasicSuccess) { // The first ssl request should fail at connecting. // then SDS send a good server secret, the second request should be OK. TEST_P(SdsDynamicDownstreamIntegrationTest, WrongSecretFirst) { - pre_worker_start_test_steps_ = [this]() { + server_init_coroutines_ = [this]() { createSdsStream(*(fake_upstreams_[1])); sendSdsResponse(getWrongSecret(server_cert_)); }; @@ -316,7 +316,7 @@ INSTANTIATE_TEST_CASE_P(IpVersionsClientType, SdsDynamicDownstreamCertValidation // A test that SDS server send a good certificate validation context for a static listener. // The first ssl request should be OK. TEST_P(SdsDynamicDownstreamCertValidationContextTest, BasicSuccess) { - pre_worker_start_test_steps_ = [this]() { + server_init_coroutines_ = [this]() { createSdsStream(*(fake_upstreams_[1])); sendSdsResponse(getCvcSecret()); }; @@ -333,7 +333,7 @@ TEST_P(SdsDynamicDownstreamCertValidationContextTest, BasicSuccess) { // The first ssl request should be OK. TEST_P(SdsDynamicDownstreamCertValidationContextTest, CombinedCertValidationContextSuccess) { enableCombinedValidationContext(true); - pre_worker_start_test_steps_ = [this]() { + server_init_coroutines_ = [this]() { createSdsStream(*(fake_upstreams_[1])); sendSdsResponse(getCvcSecretWithOnlyTrustedCa()); }; @@ -397,7 +397,7 @@ INSTANTIATE_TEST_CASE_P(IpVersions, SdsDynamicUpstreamIntegrationTest, // To test a static cluster with sds. SDS send a good client secret first. // The first request should work. TEST_P(SdsDynamicUpstreamIntegrationTest, BasicSuccess) { - pre_worker_start_test_steps_ = [this]() { + server_init_coroutines_ = [this]() { createSdsStream(*(fake_upstreams_[1])); sendSdsResponse(getClientSecret()); }; @@ -422,7 +422,7 @@ TEST_P(SdsDynamicUpstreamIntegrationTest, BasicSuccess) { // The first request should fail with 503, then SDS sends a good client secret, // the second request should work. TEST_P(SdsDynamicUpstreamIntegrationTest, WrongSecretFirst) { - pre_worker_start_test_steps_ = [this]() { + server_init_coroutines_ = [this]() { createSdsStream(*(fake_upstreams_[1])); sendSdsResponse(getWrongSecret(client_cert_)); }; From a4f7db45fbfe3bb10dc06c3f46b8a09dd69b684b Mon Sep 17 00:00:00 2001 From: Randy Smith Date: Fri, 1 Feb 2019 13:21:28 -0500 Subject: [PATCH 3/6] Fixed format Signed-off-by: Randy Smith --- test/integration/integration.cc | 6 +++--- test/integration/server.cc | 9 +++++---- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/test/integration/integration.cc b/test/integration/integration.cc index bf4e95d25257a..1eff454812362 100644 --- a/test/integration/integration.cc +++ b/test/integration/integration.cc @@ -368,9 +368,9 @@ void BaseIntegrationTest::registerTestServerPorts(const std::vector void BaseIntegrationTest::createGeneratedApiTestServer(const std::string& bootstrap_path, const std::vector& port_names) { - test_server_ = IntegrationTestServer::create(bootstrap_path, version_, - server_init_coroutines_, deterministic_, - *time_system_, *api_, defer_listener_finalization_); + test_server_ = IntegrationTestServer::create(bootstrap_path, version_, server_init_coroutines_, + deterministic_, *time_system_, *api_, + defer_listener_finalization_); if (config_helper_.bootstrap().static_resources().listeners_size() > 0 && !defer_listener_finalization_) { // Wait for listeners to be created before invoking registerTestServerPorts() below, as that diff --git a/test/integration/server.cc b/test/integration/server.cc index 5bdc1ee78f69e..892ec8f25aa7d 100644 --- a/test/integration/server.cc +++ b/test/integration/server.cc @@ -64,8 +64,8 @@ void IntegrationTestServer::waitUntilListenersReady() { } void IntegrationTestServer::start(const Network::Address::IpVersion version, - std::function server_init_coroutines, - bool deterministic, bool defer_listener_finalization) { + std::function server_init_coroutines, bool deterministic, + bool defer_listener_finalization) { ENVOY_LOG(info, "starting integration test server"); ASSERT(!thread_); thread_ = api_.threadFactory().createThread( @@ -73,8 +73,9 @@ void IntegrationTestServer::start(const Network::Address::IpVersion version, // If any steps need to be done prior to workers starting, do them now. E.g., xDS pre-init. // Note that there is no synchronization guaranteeing this happens either - // before workers starting or after server start. Any needed synchornization must occur in the routines. - // These steps are executed at this point in the code to allow server initialization to be dependent on them (e.g. control plane peers). + // before workers starting or after server start. Any needed synchornization must occur in the + // routines. These steps are executed at this point in the code to allow server initialization to + // be dependent on them (e.g. control plane peers). if (server_init_coroutines != nullptr) { server_init_coroutines(); } From 41bf760753d7ead743c960af01092defa05baf17 Mon Sep 17 00:00:00 2001 From: Randy Smith Date: Tue, 5 Feb 2019 11:10:22 -0500 Subject: [PATCH 4/6] Fix typo Signed-off-by: Randy Smith --- test/integration/server.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/integration/server.cc b/test/integration/server.cc index 05341d1e054db..a0921dd3a4c85 100644 --- a/test/integration/server.cc +++ b/test/integration/server.cc @@ -73,7 +73,7 @@ void IntegrationTestServer::start(const Network::Address::IpVersion version, // If any steps need to be done prior to workers starting, do them now. E.g., xDS pre-init. // Note that there is no synchronization guaranteeing this happens either - // before workers starting or after server start. Any needed synchornization must occur in the + // before workers starting or after server start. Any needed synchronization must occur in the // routines. These steps are executed at this point in the code to allow server initialization to // be dependent on them (e.g. control plane peers). if (server_init_coroutines != nullptr) { From c88008b3339c366d4bf49261143e398b873f1077 Mon Sep 17 00:00:00 2001 From: Randy Smith Date: Tue, 5 Feb 2019 14:05:02 -0500 Subject: [PATCH 5/6] Changed name of coroutines Signed-off-by: Randy Smith --- test/integration/ads_integration_test.cc | 2 +- test/integration/header_integration_test.cc | 2 +- test/integration/integration.cc | 6 +++--- test/integration/integration.h | 4 ++-- test/integration/sds_dynamic_integration_test.cc | 12 ++++++------ test/integration/server.cc | 10 +++++----- test/integration/server.h | 4 ++-- 7 files changed, 20 insertions(+), 20 deletions(-) diff --git a/test/integration/ads_integration_test.cc b/test/integration/ads_integration_test.cc index 155a4d27a8410..39f735cb9938f 100644 --- a/test/integration/ads_integration_test.cc +++ b/test/integration/ads_integration_test.cc @@ -644,7 +644,7 @@ TEST_P(AdsIntegrationTest, XdsBatching) { static_resources->add_listeners()->MergeFrom(buildListener("rds_listener2", "route_config2")); }); - server_init_coroutines_ = [this]() { + on_server_init_function_ = [this]() { createXdsConnection(); ASSERT_TRUE(xds_connection_->waitForNewStream(*dispatcher_, xds_stream_)); xds_stream_->startGrpcStream(); diff --git a/test/integration/header_integration_test.cc b/test/integration/header_integration_test.cc index f405cab263919..cc59e444488ac 100644 --- a/test/integration/header_integration_test.cc +++ b/test/integration/header_integration_test.cc @@ -338,7 +338,7 @@ class HeaderIntegrationTest void initialize() override { if (use_eds_) { - server_init_coroutines_ = [this]() { + on_server_init_function_ = [this]() { AssertionResult result = fake_upstreams_[1]->waitForHttpConnection(*dispatcher_, eds_connection_); RELEASE_ASSERT(result, result.message()); diff --git a/test/integration/integration.cc b/test/integration/integration.cc index b5c8370a4196e..b1e1eb9ae7b99 100644 --- a/test/integration/integration.cc +++ b/test/integration/integration.cc @@ -367,7 +367,7 @@ void BaseIntegrationTest::registerTestServerPorts(const std::vector void BaseIntegrationTest::createGeneratedApiTestServer(const std::string& bootstrap_path, const std::vector& port_names) { - test_server_ = IntegrationTestServer::create(bootstrap_path, version_, server_init_coroutines_, + test_server_ = IntegrationTestServer::create(bootstrap_path, version_, on_server_init_function_, deterministic_, *time_system_, *api_, defer_listener_finalization_); if (config_helper_.bootstrap().static_resources().listeners_size() > 0 && @@ -423,9 +423,9 @@ void BaseIntegrationTest::sendRawHttpAndWaitForResponse(int port, const char* ra IntegrationTestServerPtr BaseIntegrationTest::createIntegrationTestServer(const std::string& bootstrap_path, - std::function server_init_coroutines, + std::function on_server_init_function, Event::TestTimeSystem& time_system) { - return IntegrationTestServer::create(bootstrap_path, version_, server_init_coroutines, + return IntegrationTestServer::create(bootstrap_path, version_, on_server_init_function, deterministic_, time_system, *api_, defer_listener_finalization_); } diff --git a/test/integration/integration.h b/test/integration/integration.h index e647d9d16c0b7..ca03eee8390ba 100644 --- a/test/integration/integration.h +++ b/test/integration/integration.h @@ -234,7 +234,7 @@ class BaseIntegrationTest : Logger::Loggable { // Will not return until that server is listening. virtual IntegrationTestServerPtr createIntegrationTestServer(const std::string& bootstrap_path, - std::function server_init_coroutines, + std::function on_server_init_function, Event::TestTimeSystem& time_system); bool initialized() const { return initialized_; } @@ -246,7 +246,7 @@ class BaseIntegrationTest : Logger::Loggable { // Steps that should be done in parallel with the envoy server starting. E.g., xDS // pre-init, control plane synchronization needed for server start. - std::function server_init_coroutines_; + std::function on_server_init_function_; std::vector> fake_upstreams_; // Target number of upstreams. diff --git a/test/integration/sds_dynamic_integration_test.cc b/test/integration/sds_dynamic_integration_test.cc index 04ffa17eb0123..e8df32127a617 100644 --- a/test/integration/sds_dynamic_integration_test.cc +++ b/test/integration/sds_dynamic_integration_test.cc @@ -199,7 +199,7 @@ INSTANTIATE_TEST_SUITE_P(IpVersionsClientType, SdsDynamicDownstreamIntegrationTe // A test that SDS server send a good server secret for a static listener. // The first ssl request should be OK. TEST_P(SdsDynamicDownstreamIntegrationTest, BasicSuccess) { - server_init_coroutines_ = [this]() { + on_server_init_function_ = [this]() { createSdsStream(*(fake_upstreams_[1])); sendSdsResponse(getServerSecret()); }; @@ -215,7 +215,7 @@ TEST_P(SdsDynamicDownstreamIntegrationTest, BasicSuccess) { // The first ssl request should fail at connecting. // then SDS send a good server secret, the second request should be OK. TEST_P(SdsDynamicDownstreamIntegrationTest, WrongSecretFirst) { - server_init_coroutines_ = [this]() { + on_server_init_function_ = [this]() { createSdsStream(*(fake_upstreams_[1])); sendSdsResponse(getWrongSecret(server_cert_)); }; @@ -296,7 +296,7 @@ INSTANTIATE_TEST_SUITE_P(IpVersionsClientType, SdsDynamicDownstreamCertValidatio // A test that SDS server send a good certificate validation context for a static listener. // The first ssl request should be OK. TEST_P(SdsDynamicDownstreamCertValidationContextTest, BasicSuccess) { - server_init_coroutines_ = [this]() { + on_server_init_function_ = [this]() { createSdsStream(*(fake_upstreams_[1])); sendSdsResponse(getCvcSecret()); }; @@ -313,7 +313,7 @@ TEST_P(SdsDynamicDownstreamCertValidationContextTest, BasicSuccess) { // The first ssl request should be OK. TEST_P(SdsDynamicDownstreamCertValidationContextTest, CombinedCertValidationContextSuccess) { enableCombinedValidationContext(true); - server_init_coroutines_ = [this]() { + on_server_init_function_ = [this]() { createSdsStream(*(fake_upstreams_[1])); sendSdsResponse(getCvcSecretWithOnlyTrustedCa()); }; @@ -375,7 +375,7 @@ INSTANTIATE_TEST_SUITE_P(IpVersions, SdsDynamicUpstreamIntegrationTest, // To test a static cluster with sds. SDS send a good client secret first. // The first request should work. TEST_P(SdsDynamicUpstreamIntegrationTest, BasicSuccess) { - server_init_coroutines_ = [this]() { + on_server_init_function_ = [this]() { createSdsStream(*(fake_upstreams_[1])); sendSdsResponse(getClientSecret()); }; @@ -400,7 +400,7 @@ TEST_P(SdsDynamicUpstreamIntegrationTest, BasicSuccess) { // The first request should fail with 503, then SDS sends a good client secret, // the second request should work. TEST_P(SdsDynamicUpstreamIntegrationTest, WrongSecretFirst) { - server_init_coroutines_ = [this]() { + on_server_init_function_ = [this]() { createSdsStream(*(fake_upstreams_[1])); sendSdsResponse(getWrongSecret(client_cert_)); }; diff --git a/test/integration/server.cc b/test/integration/server.cc index a0921dd3a4c85..ad6581f1ee0a3 100644 --- a/test/integration/server.cc +++ b/test/integration/server.cc @@ -45,11 +45,11 @@ OptionsImpl createTestOptionsImpl(const std::string& config_path, const std::str IntegrationTestServerPtr IntegrationTestServer::create( const std::string& config_path, const Network::Address::IpVersion version, - std::function server_init_coroutines, bool deterministic, + std::function on_server_init_function, bool deterministic, Event::TestTimeSystem& time_system, Api::Api& api, bool defer_listener_finalization) { IntegrationTestServerPtr server{ std::make_unique(time_system, api, config_path)}; - server->start(version, server_init_coroutines, deterministic, defer_listener_finalization); + server->start(version, on_server_init_function, deterministic, defer_listener_finalization); return server; } @@ -64,7 +64,7 @@ void IntegrationTestServer::waitUntilListenersReady() { } void IntegrationTestServer::start(const Network::Address::IpVersion version, - std::function server_init_coroutines, bool deterministic, + std::function on_server_init_function, bool deterministic, bool defer_listener_finalization) { ENVOY_LOG(info, "starting integration test server"); ASSERT(!thread_); @@ -76,8 +76,8 @@ void IntegrationTestServer::start(const Network::Address::IpVersion version, // before workers starting or after server start. Any needed synchronization must occur in the // routines. These steps are executed at this point in the code to allow server initialization to // be dependent on them (e.g. control plane peers). - if (server_init_coroutines != nullptr) { - server_init_coroutines(); + if (on_server_init_function != nullptr) { + on_server_init_function(); } // Wait for the server to be created and the number of initial listeners to wait for to be set. diff --git a/test/integration/server.h b/test/integration/server.h index a99fda0d7963a..3652119081244 100644 --- a/test/integration/server.h +++ b/test/integration/server.h @@ -174,7 +174,7 @@ class IntegrationTestServer : public Logger::Loggable, public: static IntegrationTestServerPtr create(const std::string& config_path, const Network::Address::IpVersion version, - std::function server_init_coroutines, + std::function on_server_init_function, bool deterministic, Event::TestTimeSystem& time_system, Api::Api& api, bool defer_listener_finalization = false); // Note that the derived class is responsible for tearing down the server in its @@ -191,7 +191,7 @@ class IntegrationTestServer : public Logger::Loggable, on_worker_listener_removed_cb_ = on_worker_listener_removed; } void start(const Network::Address::IpVersion version, - std::function server_init_coroutines, bool deterministic, + std::function on_server_init_function, bool deterministic, bool defer_listener_finalization); void waitForCounterGe(const std::string& name, uint64_t value) override { From 9df9e0aae7961c492660ad59b8fd0c0fcf0193f3 Mon Sep 17 00:00:00 2001 From: Randy Smith Date: Wed, 6 Feb 2019 12:28:03 -0500 Subject: [PATCH 6/6] Fixed format Signed-off-by: Randy Smith --- test/integration/integration.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/test/integration/integration.cc b/test/integration/integration.cc index 5e493d5f8c8fd..5b8de6e6495a9 100644 --- a/test/integration/integration.cc +++ b/test/integration/integration.cc @@ -368,9 +368,9 @@ void BaseIntegrationTest::registerTestServerPorts(const std::vector void BaseIntegrationTest::createGeneratedApiTestServer(const std::string& bootstrap_path, const std::vector& port_names) { - test_server_ = IntegrationTestServer::create(bootstrap_path, version_, - on_server_init_function_, deterministic_, - timeSystem(), *api_, defer_listener_finalization_); + test_server_ = IntegrationTestServer::create(bootstrap_path, version_, on_server_init_function_, + deterministic_, timeSystem(), *api_, + defer_listener_finalization_); if (config_helper_.bootstrap().static_resources().listeners_size() > 0 && !defer_listener_finalization_) { // Wait for listeners to be created before invoking registerTestServerPorts() below, as that