Skip to content

ssl_integration_test: fix tsan errors. #879

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 1 commit into from
May 2, 2017
Merged

ssl_integration_test: fix tsan errors. #879

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 0 additions & 1 deletion test/integration/integration.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,6 @@ class BaseIntegrationTest : Logger::Loggable<Logger::Id::testing> {

Api::ApiPtr api_;
Event::DispatcherPtr dispatcher_;
Stats::IsolatedStoreImpl stats_store_;

protected:
void testRouterRedirect(Http::CodecClient::Type type);
Expand Down
3 changes: 2 additions & 1 deletion test/integration/ssl_integration_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,8 @@ ClientContextPtr SslIntegrationTest::createClientSslContext(bool alpn, bool san)
}
Json::ObjectPtr loader = TestEnvironment::jsonLoadFromString(target);
ContextConfigImpl cfg(*loader);
return context_manager_->createSslClientContext(test_server_->store(), cfg);
static auto* client_stats_store = new Stats::TestIsolatedStoreImpl();
return context_manager_->createSslClientContext(*client_stats_store, cfg);
}

Network::ClientConnectionPtr SslIntegrationTest::makeSslClientConnection(bool alpn, bool san) {
Expand Down