Merge pull request #24874 from yashykt/xdssecdatarace

Register certificate provider factories after init
4 years ago · d7b70c3ea2
parent 638c34ceba b08861b60f
commit d7b70c3ea2
1 changed files with 1 additions and 1 deletions
--- a/test/cpp/end2end/xds_end2end_test.cc
+++ b/test/cpp/end2end/xds_end2end_test.cc
@ -5298,13 +5298,13 @@ class XdsSecurityTest : public BasicTest {
 protected:
  static void SetUpTestCase() {
    gpr_setenv("GRPC_XDS_EXPERIMENTAL_SECURITY_SUPPORT", "true");
+    BasicTest::SetUpTestCase();
    grpc_core::CertificateProviderRegistry::RegisterCertificateProviderFactory(
        absl::make_unique<FakeCertificateProviderFactory>(
            "fake1", &g_fake1_cert_data_map));
    grpc_core::CertificateProviderRegistry::RegisterCertificateProviderFactory(
        absl::make_unique<FakeCertificateProviderFactory>(
            "fake2", &g_fake2_cert_data_map));
-    BasicTest::SetUpTestCase();
  }

  static void TearDownTestCase() {