Moved starttls integration test to test/extensions/transport_sockets/…

…starttls. (#14425) Signed-off-by: Christoph Pakulski <[email protected]>
envoyproxy · Dec 15, 2020 · 004296b · 004296b
1 parent f19d025
commit 004296b
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 28 deletions.
diff --git a/test/extensions/transport_sockets/starttls/BUILD b/test/extensions/transport_sockets/starttls/BUILD
@@ -1,6 +1,7 @@
 load(
     "//bazel:envoy_build_system.bzl",
     "envoy_package",
+    "envoy_proto_library",
 )
 load(
     "//test/extensions:extensions_build_system.bzl",
@@ -24,3 +25,30 @@ envoy_extension_cc_test(
         "@envoy_api//envoy/extensions/transport_sockets/starttls/v3:pkg_cc_proto",
     ],
 )
+
+envoy_proto_library(
+    name = "starttls_integration_proto",
+    srcs = [":starttls_integration_test.proto"],
+)
+
+envoy_extension_cc_test(
+    name = "starttls_integration_test",
+    srcs = [
+        "starttls_integration_test.cc",
+    ],
+    data = [
+        "//test/config/integration/certs",
+    ],
+    extension_name = "envoy.transport_sockets.starttls",
+    # TODO(envoyproxy/windows-dev): Investigate timeout
+    tags = ["flaky_on_windows"],
+    deps = [
+        ":starttls_integration_proto_cc_proto",
+        "//source/extensions/filters/network/tcp_proxy:config",
+        "//source/extensions/transport_sockets/raw_buffer:config",
+        "//source/extensions/transport_sockets/starttls:config",
+        "//test/integration:integration_lib",
+        "//test/test_common:registry_lib",
+        "@envoy_api//envoy/extensions/transport_sockets/raw_buffer/v3:pkg_cc_proto",
+    ],
+)
diff --git a/.../integration/starttls_integration_test.cc → ...ets/starttls/starttls_integration_test.cc b/.../integration/starttls_integration_test.cc → ...ets/starttls/starttls_integration_test.cc
@@ -9,10 +9,10 @@
 #include "extensions/transport_sockets/raw_buffer/config.h"
 
 #include "test/config/utility.h"
+#include "test/extensions/transport_sockets/starttls/starttls_integration_test.pb.h"
+#include "test/extensions/transport_sockets/starttls/starttls_integration_test.pb.validate.h"
 #include "test/integration/integration.h"
 #include "test/integration/ssl_utility.h"
-#include "test/integration/starttls_integration_test.pb.h"
-#include "test/integration/starttls_integration_test.pb.validate.h"
 #include "test/test_common/registry.h"
 
 #include "gtest/gtest.h"

diff --git a/...tegration/starttls_integration_test.proto → .../starttls/starttls_integration_test.proto b/...tegration/starttls_integration_test.proto → .../starttls/starttls_integration_test.proto
diff --git a/test/integration/BUILD b/test/integration/BUILD
@@ -1216,32 +1216,6 @@ envoy_cc_test(
     ],
 )
 
-envoy_proto_library(
-    name = "starttls_integration_proto",
-    srcs = [":starttls_integration_test.proto"],
-)
-
-envoy_cc_test(
-    name = "starttls_integration_test",
-    srcs = [
-        "starttls_integration_test.cc",
-    ],
-    data = [
-        "//test/config/integration/certs",
-    ],
-    # TODO(envoyproxy/windows-dev): Investigate timeout
-    tags = ["flaky_on_windows"],
-    deps = [
-        ":integration_lib",
-        ":starttls_integration_proto_cc_proto",
-        "//source/extensions/filters/network/tcp_proxy:config",
-        "//source/extensions/transport_sockets/raw_buffer:config",
-        "//source/extensions/transport_sockets/starttls:config",
-        "//test/test_common:registry_lib",
-        "@envoy_api//envoy/extensions/transport_sockets/raw_buffer/v3:pkg_cc_proto",
-    ],
-)
-
 envoy_cc_test(
     name = "tcp_tunneling_integration_test",
     srcs = [