From f86fab8a646c1383594740e1d091f614ad92a16e Mon Sep 17 00:00:00 2001 From: Muge Chen Date: Mon, 13 Jul 2020 13:56:05 +0000 Subject: [PATCH 1/2] resolve dependencies Signed-off-by: Muge Chen --- test/extensions/common/proxy_protocol/BUILD | 1 - .../proxy_protocol/proxy_protocol_regression_test.cc | 1 - test/extensions/common/tap/BUILD | 3 ++- test/extensions/common/tap/admin_test.cc | 3 ++- test/extensions/tracers/datadog/config_test.cc | 3 ++- test/extensions/tracers/dynamic_ot/config_test.cc | 3 ++- test/extensions/tracers/lightstep/config_test.cc | 3 ++- test/extensions/tracers/opencensus/config_test.cc | 3 ++- test/extensions/tracers/xray/BUILD | 7 +++++-- test/extensions/tracers/xray/config_test.cc | 4 +++- test/extensions/tracers/xray/tracer_test.cc | 2 +- test/extensions/tracers/xray/xray_tracer_impl_test.cc | 4 +++- test/extensions/tracers/zipkin/BUILD | 3 ++- test/extensions/tracers/zipkin/config_test.cc | 3 ++- test/extensions/upstreams/http/tcp/BUILD | 3 ++- .../extensions/upstreams/http/tcp/upstream_request_test.cc | 3 ++- 16 files changed, 32 insertions(+), 17 deletions(-) diff --git a/test/extensions/common/proxy_protocol/BUILD b/test/extensions/common/proxy_protocol/BUILD index 90a37c8cd60d..414674d84711 100644 --- a/test/extensions/common/proxy_protocol/BUILD +++ b/test/extensions/common/proxy_protocol/BUILD @@ -34,7 +34,6 @@ envoy_cc_test( "//source/server:connection_handler_lib", "//test/mocks/buffer:buffer_mocks", "//test/mocks/network:network_mocks", - "//test/mocks/server:server_mocks", "//test/test_common:environment_lib", "//test/test_common:network_utility_lib", "//test/test_common:utility_lib", diff --git a/test/extensions/common/proxy_protocol/proxy_protocol_regression_test.cc b/test/extensions/common/proxy_protocol/proxy_protocol_regression_test.cc index cd0ed34c9f3f..8654352291de 100644 --- a/test/extensions/common/proxy_protocol/proxy_protocol_regression_test.cc +++ b/test/extensions/common/proxy_protocol/proxy_protocol_regression_test.cc @@ -13,7 +13,6 @@ #include "test/mocks/buffer/mocks.h" #include "test/mocks/network/mocks.h" -#include "test/mocks/server/mocks.h" #include "test/test_common/environment.h" #include "test/test_common/network_utility.h" #include "test/test_common/utility.h" diff --git a/test/extensions/common/tap/BUILD b/test/extensions/common/tap/BUILD index 5483de65de26..9775f2873b05 100644 --- a/test/extensions/common/tap/BUILD +++ b/test/extensions/common/tap/BUILD @@ -25,7 +25,8 @@ envoy_cc_test( srcs = ["admin_test.cc"], deps = [ "//source/extensions/common/tap:admin", - "//test/mocks/server:server_mocks", + "//test/mocks/server:admin_mocks", + "//test/mocks/server:admin_stream_mocks", "@envoy_api//envoy/config/tap/v3:pkg_cc_proto", ], ) diff --git a/test/extensions/common/tap/admin_test.cc b/test/extensions/common/tap/admin_test.cc index 0ee2bc2af042..2e3d940eadc5 100644 --- a/test/extensions/common/tap/admin_test.cc +++ b/test/extensions/common/tap/admin_test.cc @@ -2,7 +2,8 @@ #include "extensions/common/tap/admin.h" -#include "test/mocks/server/mocks.h" +#include "test/mocks/server/admin.h" +#include "test/mocks/server/admin_stream.h" #include "gtest/gtest.h" diff --git a/test/extensions/tracers/datadog/config_test.cc b/test/extensions/tracers/datadog/config_test.cc index 87d259c0f4e7..52a44719367c 100644 --- a/test/extensions/tracers/datadog/config_test.cc +++ b/test/extensions/tracers/datadog/config_test.cc @@ -4,7 +4,8 @@ #include "extensions/tracers/datadog/config.h" -#include "test/mocks/server/mocks.h" +#include "test/mocks/server/tracer_factory.h" +#include "test/mocks/server/tracer_factory_context.h" #include "gmock/gmock.h" #include "gtest/gtest.h" diff --git a/test/extensions/tracers/dynamic_ot/config_test.cc b/test/extensions/tracers/dynamic_ot/config_test.cc index 90c77529f568..a655b23e5f6c 100644 --- a/test/extensions/tracers/dynamic_ot/config_test.cc +++ b/test/extensions/tracers/dynamic_ot/config_test.cc @@ -4,7 +4,8 @@ #include "extensions/tracers/dynamic_ot/config.h" -#include "test/mocks/server/mocks.h" +#include "test/mocks/server/tracer_factory.h" +#include "test/mocks/server/tracer_factory_context.h" #include "test/test_common/environment.h" #include "fmt/printf.h" diff --git a/test/extensions/tracers/lightstep/config_test.cc b/test/extensions/tracers/lightstep/config_test.cc index ec09bf27c6c9..e56ff7b0c507 100644 --- a/test/extensions/tracers/lightstep/config_test.cc +++ b/test/extensions/tracers/lightstep/config_test.cc @@ -4,7 +4,8 @@ #include "extensions/tracers/lightstep/config.h" -#include "test/mocks/server/mocks.h" +#include "test/mocks/server/tracer_factory.h" +#include "test/mocks/server/tracer_factory_context.h" #include "gmock/gmock.h" #include "gtest/gtest.h" diff --git a/test/extensions/tracers/opencensus/config_test.cc b/test/extensions/tracers/opencensus/config_test.cc index 0f5baa929bdc..c27186c9b675 100644 --- a/test/extensions/tracers/opencensus/config_test.cc +++ b/test/extensions/tracers/opencensus/config_test.cc @@ -5,7 +5,8 @@ #include "extensions/tracers/opencensus/config.h" -#include "test/mocks/server/mocks.h" +#include "test/mocks/server/tracer_factory.h" +#include "test/mocks/server/tracer_factory_context.h" #include "gmock/gmock.h" #include "gtest/gtest.h" diff --git a/test/extensions/tracers/xray/BUILD b/test/extensions/tracers/xray/BUILD index 6ebfdf8071d0..bf4e36dcd7be 100644 --- a/test/extensions/tracers/xray/BUILD +++ b/test/extensions/tracers/xray/BUILD @@ -27,7 +27,8 @@ envoy_extension_cc_test( "//test/mocks/http:http_mocks", "//test/mocks/local_info:local_info_mocks", "//test/mocks/runtime:runtime_mocks", - "//test/mocks/server:server_mocks", + "//test/mocks/server:instance_mocks", + "//test/mocks/server:tracer_factory_context_mocks", "//test/mocks/stats:stats_mocks", "//test/mocks/thread_local:thread_local_mocks", "//test/mocks/tracing:tracing_mocks", @@ -43,7 +44,9 @@ envoy_extension_cc_test( extension_name = "envoy.tracers.xray", deps = [ "//source/extensions/tracers/xray:config", - "//test/mocks/server:server_mocks", + "//test/mocks/server:instance_mocks", + "//test/mocks/server:tracer_factory_context_mocks", + "//test/mocks/server:tracer_factory_mocks", "//test/test_common:environment_lib", "//test/test_common:utility_lib", "@envoy_api//envoy/config/trace/v3:pkg_cc_proto", diff --git a/test/extensions/tracers/xray/config_test.cc b/test/extensions/tracers/xray/config_test.cc index b71092f60eda..ff39c0dbeaf8 100644 --- a/test/extensions/tracers/xray/config_test.cc +++ b/test/extensions/tracers/xray/config_test.cc @@ -5,7 +5,9 @@ #include "extensions/tracers/xray/config.h" -#include "test/mocks/server/mocks.h" +#include "test/mocks/server/instance.h" +#include "test/mocks/server/tracer_factory.h" +#include "test/mocks/server/tracer_factory_context.h" #include "test/test_common/environment.h" #include "gmock/gmock.h" diff --git a/test/extensions/tracers/xray/tracer_test.cc b/test/extensions/tracers/xray/tracer_test.cc index fcd448ba4df0..c82e73056a5f 100644 --- a/test/extensions/tracers/xray/tracer_test.cc +++ b/test/extensions/tracers/xray/tracer_test.cc @@ -10,7 +10,7 @@ #include "extensions/tracers/xray/tracer.h" #include "extensions/tracers/xray/xray_configuration.h" -#include "test/mocks/server/mocks.h" +#include "test/mocks/server/instance.h" #include "test/mocks/tracing/mocks.h" #include "test/test_common/environment.h" #include "test/test_common/network_utility.h" diff --git a/test/extensions/tracers/xray/xray_tracer_impl_test.cc b/test/extensions/tracers/xray/xray_tracer_impl_test.cc index 81f9532cb4a8..0019ef66544e 100644 --- a/test/extensions/tracers/xray/xray_tracer_impl_test.cc +++ b/test/extensions/tracers/xray/xray_tracer_impl_test.cc @@ -5,7 +5,9 @@ #include "extensions/tracers/xray/xray_tracer_impl.h" #include "test/mocks/runtime/mocks.h" -#include "test/mocks/server/mocks.h" +#include "test/mocks/server/instance.h" +#include "test/mocks/server/tracer_factory.h" +#include "test/mocks/server/tracer_factory_context.h" #include "test/mocks/thread_local/mocks.h" #include "test/mocks/tracing/mocks.h" #include "test/test_common/utility.h" diff --git a/test/extensions/tracers/zipkin/BUILD b/test/extensions/tracers/zipkin/BUILD index 08da01bfa49b..efa94415b031 100644 --- a/test/extensions/tracers/zipkin/BUILD +++ b/test/extensions/tracers/zipkin/BUILD @@ -52,7 +52,8 @@ envoy_extension_cc_test( extension_name = "envoy.tracers.zipkin", deps = [ "//source/extensions/tracers/zipkin:config", - "//test/mocks/server:server_mocks", + "//test/mocks/server:tracer_factory_context_mocks", + "//test/mocks/server:tracer_factory_mocks", "//test/test_common:utility_lib", "@envoy_api//envoy/config/trace/v3:pkg_cc_proto", ], diff --git a/test/extensions/tracers/zipkin/config_test.cc b/test/extensions/tracers/zipkin/config_test.cc index 352a923ffe23..0f62b8f7fd7f 100644 --- a/test/extensions/tracers/zipkin/config_test.cc +++ b/test/extensions/tracers/zipkin/config_test.cc @@ -5,7 +5,8 @@ #include "extensions/tracers/zipkin/config.h" -#include "test/mocks/server/mocks.h" +#include "test/mocks/server/tracer_factory.h" +#include "test/mocks/server/tracer_factory_context.h" #include "gmock/gmock.h" #include "gtest/gtest.h" diff --git a/test/extensions/upstreams/http/tcp/BUILD b/test/extensions/upstreams/http/tcp/BUILD index 39a5a8d33a89..057aeff867b2 100644 --- a/test/extensions/upstreams/http/tcp/BUILD +++ b/test/extensions/upstreams/http/tcp/BUILD @@ -22,7 +22,8 @@ envoy_cc_test( "//test/mocks/http:http_mocks", "//test/mocks/network:network_mocks", "//test/mocks/router:router_mocks", - "//test/mocks/server:server_mocks", + "//test/mocks/server:factory_context_mocks", + "//test/mocks/server:instance_mocks", "//test/mocks/upstream:upstream_mocks", "//test/test_common:environment_lib", "//test/test_common:simulated_time_system_lib", diff --git a/test/extensions/upstreams/http/tcp/upstream_request_test.cc b/test/extensions/upstreams/http/tcp/upstream_request_test.cc index 3f5fc02692df..114648c00b00 100644 --- a/test/extensions/upstreams/http/tcp/upstream_request_test.cc +++ b/test/extensions/upstreams/http/tcp/upstream_request_test.cc @@ -10,7 +10,8 @@ #include "test/mocks/common.h" #include "test/mocks/http/mocks.h" #include "test/mocks/router/mocks.h" -#include "test/mocks/server/mocks.h" +#include "test/mocks/server/factory_context.h" +#include "test/mocks/server/instance.h" #include "test/mocks/tcp/mocks.h" #include "test/test_common/utility.h" From 813b52407e6d777f320252b035a829f490843cb1 Mon Sep 17 00:00:00 2001 From: Muge Chen Date: Tue, 14 Jul 2020 02:17:14 +0000 Subject: [PATCH 2/2] Kick CI Signed-off-by: Muge Chen