Chiebot-Mirror
/
grpc
mirror of https://github.com/grpc/grpc.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

[CI] Upgraded clang to 18 in sanity tests (#37593)

Browse Source 
Closes #37593

PiperOrigin-RevId: 668971470
pull/37603/head
Esun Kim 3 months ago committed by Copybara-Service
parent a374ef377d
commit be26969058
34 changed files with 439 additions and 486 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 9
      .clang-tidy
  2. 6
      include/grpc/support/sync_generic.h
  3. 2
      src/core/ext/transport/chaotic_good/server/chaotic_good_server.h
  4. 2
      src/core/lib/event_engine/cf_engine/cftype_unique_ref.h
  5. 4
      src/core/lib/event_engine/posix_engine/posix_engine_listener.h
  6. 2
      src/core/lib/event_engine/posix_engine/tcp_socket_utils.h
  7. 2
      src/core/lib/event_engine/windows/grpc_polled_fd_windows.cc
  8. 6
      src/core/lib/promise/interceptor_list.h
  9. 2
      src/core/resolver/dns/c_ares/grpc_ares_ev_driver_windows.cc
  10. 2
      src/core/util/latent_see.h
  11. 2
      src/core/util/ring_buffer.h
  12. 3
      src/core/util/spinlock.h
  13. 3
      src/objective-c/manual_tests/GrpcIosTestUITests/GrpcIosTestUITests.m
  14. 2
      templates/tools/dockerfile/grpc_clang_format/Dockerfile.template
  15. 2
      templates/tools/dockerfile/grpc_clang_tidy/Dockerfile.template
  16. 10
      templates/tools/dockerfile/test/sanity/Dockerfile.template
  17. 754
      test/core/end2end/end2end_test_suites.cc
  18. 14
      test/core/end2end/h2_ssl_cert_test.cc
  19. 2
      test/core/event_engine/default_engine_methods_test.cc
  20. 2
      test/core/event_engine/posix/posix_engine_test_utils.h
  21. 3
      test/core/gprpp/match_test.cc
  22. 6
      test/core/iomgr/pollset_windows_starvation_test.cc
  23. 3
      test/core/promise/bm_party.cc
  24. 8
      test/core/promise/if_test.cc
  25. 44
      test/core/transport/chttp2/ping_callbacks_test.cc
  26. 6
      test/cpp/cocoapods/generic/generic.mm
  27. 2
      test/cpp/qps/interarrival.h
  28. 2
      test/cpp/qps/server_async.cc
  29. 2
      test/cpp/server/server_builder_with_socket_mutator_test.cc
  30. 2
      tools/bazelify_tests/dockerimage_current_versions.bzl
  31. 2
      tools/dockerfile/grpc_clang_format/Dockerfile
  32. 2
      tools/dockerfile/grpc_clang_tidy/Dockerfile
  33. 2
      tools/dockerfile/test/sanity.current_version
  34. 10
      tools/dockerfile/test/sanity/Dockerfile

9
.clang-tidy
Unescape View File

@ -69,31 +69,37 @@ Checks: '-*,
bugprone-*, bugprone-*,
-bugprone-assignment-in-if-condition, -bugprone-assignment-in-if-condition,
-bugprone-branch-clone, -bugprone-branch-clone,
-bugprone-casting-through-void,
-bugprone-easily-swappable-parameters, -bugprone-easily-swappable-parameters,
-bugprone-empty-catch, -bugprone-empty-catch,
-bugprone-exception-escape, -bugprone-exception-escape,
-bugprone-implicit-widening-of-multiplication-result, -bugprone-implicit-widening-of-multiplication-result,
-bugprone-inc-dec-in-conditions,
-bugprone-infinite-loop, -bugprone-infinite-loop,
-bugprone-multi-level-implicit-pointer-conversion,
-bugprone-narrowing-conversions, -bugprone-narrowing-conversions,
-bugprone-not-null-terminated-result, -bugprone-not-null-terminated-result,
-bugprone-optional-value-conversion,
-bugprone-reserved-identifier, -bugprone-reserved-identifier,
-bugprone-signed-char-misuse, -bugprone-signed-char-misuse,
-bugprone-sizeof-expression, -bugprone-sizeof-expression,
-bugprone-switch-missing-default-case, -bugprone-switch-missing-default-case,
-bugprone-too-small-loop-variable, -bugprone-too-small-loop-variable,
-bugprone-unchecked-optional-access, -bugprone-unchecked-optional-access,
-bugprone-unused-local-non-trivial-variable,
-bugprone-unused-return-value,
google-*, google-*,
-google-readability-casting, -google-readability-casting,
-google-runtime-int, -google-runtime-int,
-google-runtime-references, -google-runtime-references,
performance-*, performance-*,
-performance-avoid-endl, -performance-avoid-endl,
-performance-enum-size,
-performance-no-automatic-move, -performance-no-automatic-move,
-performance-no-int-to-ptr, -performance-no-int-to-ptr,
-performance-noexcept-swap, -performance-noexcept-swap,
-performance-unnecessary-copy-initialization, -performance-unnecessary-copy-initialization,
-performance-unnecessary-value-param, -performance-unnecessary-value-param,
clang-diagnostic-deprecated-declarations,
clang-diagnostic-deprecated-register, clang-diagnostic-deprecated-register,
clang-diagnostic-expansion-to-defined, clang-diagnostic-expansion-to-defined,
clang-diagnostic-ignored-attributes, clang-diagnostic-ignored-attributes,
@ -102,6 +108,7 @@ Checks: '-*,
clang-diagnostic-shift-sign-overflow, clang-diagnostic-shift-sign-overflow,
clang-diagnostic-tautological-undefined-compare, clang-diagnostic-tautological-undefined-compare,
clang-diagnostic-thread-safety*, clang-diagnostic-thread-safety*,
-clang-diagnostic-thread-safety-reference-return,
clang-diagnostic-undefined-bool-conversion, clang-diagnostic-undefined-bool-conversion,
clang-diagnostic-unreachable-code, clang-diagnostic-unreachable-code,
clang-diagnostic-unreachable-code-loop-increment, clang-diagnostic-unreachable-code-loop-increment,

6
include/grpc/support/sync_generic.h
Unescape View File

@ -29,8 +29,7 @@ typedef struct {
gpr_atm state; gpr_atm state;
} gpr_event; } gpr_event;
#define GPR_EVENT_INIT \ #define GPR_EVENT_INIT {0}
{ 0 }
/* gpr_refcount */ /* gpr_refcount */
typedef struct { typedef struct {
@ -42,7 +41,6 @@ typedef struct {
gpr_atm value; gpr_atm value;
} gpr_stats_counter; } gpr_stats_counter;
#define GPR_STATS_INIT \ #define GPR_STATS_INIT {0}
{ 0 }
#endif /* GRPC_SUPPORT_SYNC_GENERIC_H */ #endif /* GRPC_SUPPORT_SYNC_GENERIC_H */

2
src/core/ext/transport/chaotic_good/server/chaotic_good_server.h
Unescape View File

@ -83,7 +83,7 @@ class ChaoticGoodServerListener final : public Server::ListenerInterface {
class HandshakingState : public RefCounted<HandshakingState> { class HandshakingState : public RefCounted<HandshakingState> {
public: public:
explicit HandshakingState(RefCountedPtr<ActiveConnection> connection); explicit HandshakingState(RefCountedPtr<ActiveConnection> connection);
~HandshakingState() override{}; ~HandshakingState() override {};
void Start(std::unique_ptr< void Start(std::unique_ptr<
grpc_event_engine::experimental::EventEngine::Endpoint> grpc_event_engine::experimental::EventEngine::Endpoint>
endpoint); endpoint);

2
src/core/lib/event_engine/cf_engine/cftype_unique_ref.h
Unescape View File

@ -37,7 +37,7 @@ class CFTypeUniqueRef {
CFTypeUniqueRef(CFTypeUniqueRef const&) = delete; CFTypeUniqueRef(CFTypeUniqueRef const&) = delete;
CFTypeUniqueRef& operator=(CFTypeUniqueRef const&) = delete; CFTypeUniqueRef& operator=(CFTypeUniqueRef const&) = delete;
CFTypeUniqueRef(CFTypeUniqueRef&& other) : cf_type_ref_(other.release()){}; CFTypeUniqueRef(CFTypeUniqueRef&& other) : cf_type_ref_(other.release()) {};
CFTypeUniqueRef& operator=(CFTypeUniqueRef&& other) { CFTypeUniqueRef& operator=(CFTypeUniqueRef&& other) {
reset(other.release()); reset(other.release());
return *this; return *this;

4
src/core/lib/event_engine/posix_engine/posix_engine_listener.h
Unescape View File

@ -93,7 +93,7 @@ class PosixEngineListenerImpl
ResolvedAddressToNormalizedString(socket_.addr), ResolvedAddressToNormalizedString(socket_.addr),
listener_->poller_->CanTrackErrors())), listener_->poller_->CanTrackErrors())),
notify_on_accept_(PosixEngineClosure::ToPermanentClosure( notify_on_accept_(PosixEngineClosure::ToPermanentClosure(
[this](absl::Status status) { NotifyOnAccept(status); })){}; [this](absl::Status status) { NotifyOnAccept(status); })) {};
// Start listening for incoming connections on the socket. // Start listening for incoming connections on the socket.
void Start(); void Start();
// Internal callback invoked when the socket has incoming connections to // Internal callback invoked when the socket has incoming connections to
@ -129,7 +129,7 @@ class PosixEngineListenerImpl
class ListenerAsyncAcceptors : public ListenerSocketsContainer { class ListenerAsyncAcceptors : public ListenerSocketsContainer {
public: public:
explicit ListenerAsyncAcceptors(PosixEngineListenerImpl* listener) explicit ListenerAsyncAcceptors(PosixEngineListenerImpl* listener)
: listener_(listener){}; : listener_(listener) {};
void UpdateOnAppendCallback( void UpdateOnAppendCallback(
PosixListenerWithFdSupport::OnPosixBindNewFdCallback on_append) { PosixListenerWithFdSupport::OnPosixBindNewFdCallback on_append) {

2
src/core/lib/event_engine/posix_engine/tcp_socket_utils.h
Unescape View File

@ -163,7 +163,7 @@ class PosixSocketWrapper {
public: public:
explicit PosixSocketWrapper(int fd) : fd_(fd) { CHECK_GT(fd_, 0); } explicit PosixSocketWrapper(int fd) : fd_(fd) { CHECK_GT(fd_, 0); }
PosixSocketWrapper() : fd_(-1){}; PosixSocketWrapper() : fd_(-1) {};
~PosixSocketWrapper() = default; ~PosixSocketWrapper() = default;

2
src/core/lib/event_engine/windows/grpc_polled_fd_windows.cc
Unescape View File

@ -82,7 +82,7 @@ grpc_slice FlattenIovec(const struct iovec* iov, int iov_count) {
// instantiated at the top of the virtual socket function callstack. // instantiated at the top of the virtual socket function callstack.
class WSAErrorContext { class WSAErrorContext {
public: public:
explicit WSAErrorContext(){}; explicit WSAErrorContext() {};
~WSAErrorContext() { ~WSAErrorContext() {
if (error_ != 0) { if (error_ != 0) {

6
src/core/lib/promise/interceptor_list.h
Unescape View File

@ -217,15 +217,13 @@ class InterceptorList {
// Append a new map to the end of the chain. // Append a new map to the end of the chain.
template <typename Fn> template <typename Fn>
void AppendMap(Fn fn, DebugLocation from) { void AppendMap(Fn fn, DebugLocation from) {
Append(MakeMapToAdd( Append(MakeMapToAdd(std::move(fn), [] {}, from));
std::move(fn), [] {}, from));
} }
// Prepend a new map to the beginning of the chain. // Prepend a new map to the beginning of the chain.
template <typename Fn> template <typename Fn>
void PrependMap(Fn fn, DebugLocation from) { void PrependMap(Fn fn, DebugLocation from) {
Prepend(MakeMapToAdd( Prepend(MakeMapToAdd(std::move(fn), [] {}, from));
std::move(fn), [] {}, from));
} }
// Append a new map to the end of the chain, with a cleanup function to be // Append a new map to the end of the chain, with a cleanup function to be

2
src/core/resolver/dns/c_ares/grpc_ares_ev_driver_windows.cc
Unescape View File

@ -72,7 +72,7 @@ namespace {
// instantiated at the top of the virtual socket function callstack. // instantiated at the top of the virtual socket function callstack.
class WSAErrorContext final { class WSAErrorContext final {
public: public:
explicit WSAErrorContext(){}; explicit WSAErrorContext() {};
~WSAErrorContext() { ~WSAErrorContext() {
if (error_ != 0) { if (error_ != 0) {

2
src/core/util/latent_see.h
Unescape View File

@ -156,7 +156,7 @@ class Log {
static std::atomic<uintptr_t> free_bins_; static std::atomic<uintptr_t> free_bins_;
absl::AnyInvocable<void(absl::string_view)> stats_flusher_ = nullptr; absl::AnyInvocable<void(absl::string_view)> stats_flusher_ = nullptr;
struct Fragment { struct Fragment {
Fragment() : active(&primary){}; Fragment() : active(&primary) {};
Mutex mu; Mutex mu;
RingBuffer<RecordedEvent, Log::kMaxEventsPerCpu>* active RingBuffer<RecordedEvent, Log::kMaxEventsPerCpu>* active
ABSL_GUARDED_BY(mu); ABSL_GUARDED_BY(mu);

2
src/core/util/ring_buffer.h
Unescape View File

@ -64,7 +64,7 @@ class RingBuffer {
T operator*() { return buffer_->data_[head_]; } T operator*() { return buffer_->data_[head_]; }
RingBufferIterator() : buffer_(nullptr), head_(0), size_(0){}; RingBufferIterator() : buffer_(nullptr), head_(0), size_(0) {};
RingBufferIterator(const RingBufferIterator& other) = default; RingBufferIterator(const RingBufferIterator& other) = default;
explicit RingBufferIterator(const RingBuffer<T, kCapacity>* buffer) explicit RingBufferIterator(const RingBuffer<T, kCapacity>* buffer)
: buffer_(buffer), head_(buffer->head_), size_(buffer->size_) { : buffer_(buffer), head_(buffer->head_), size_(buffer->size_) {

3
src/core/util/spinlock.h
Unescape View File

@ -34,8 +34,7 @@ struct gpr_spinlock {
#else #else
#define GPR_SPINLOCK_INITIALIZER ((gpr_spinlock){0}) #define GPR_SPINLOCK_INITIALIZER ((gpr_spinlock){0})
#endif #endif
#define GPR_SPINLOCK_STATIC_INITIALIZER \ #define GPR_SPINLOCK_STATIC_INITIALIZER {0}
{ 0 }
#define gpr_spinlock_trylock(lock) (gpr_atm_acq_cas(&(lock)->atm, 0, 1)) #define gpr_spinlock_trylock(lock) (gpr_atm_acq_cas(&(lock)->atm, 0, 1))
#define gpr_spinlock_unlock(lock) (gpr_atm_rel_store(&(lock)->atm, 0)) #define gpr_spinlock_unlock(lock) (gpr_atm_rel_store(&(lock)->atm, 0))

3
src/objective-c/manual_tests/GrpcIosTestUITests/GrpcIosTestUITests.m
Unescape View File

@ -75,8 +75,7 @@ int const kNumIterations = 1;
[NSThread sleepForTimeInterval:1]; [NSThread sleepForTimeInterval:1];
} }
// Wait until all events in run loop have been processed // Wait until all events in run loop have been processed
while (CFRunLoopRunInMode(kCFRunLoopDefaultMode, 0.1, true) == kCFRunLoopRunHandledSource) while (CFRunLoopRunInMode(kCFRunLoopDefaultMode, 0.1, true) == kCFRunLoopRunHandledSource);
;
NSLog(@"Pressing button: %@", name); NSLog(@"Pressing button: %@", name);
[testApp.buttons[name] tap]; [testApp.buttons[name] tap];

2
templates/tools/dockerfile/grpc_clang_format/Dockerfile.template
Unescape View File

@ -14,7 +14,7 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
FROM silkeh/clang:17-bookworm FROM silkeh/clang:18-bookworm
ADD clang_format_all_the_things.sh / ADD clang_format_all_the_things.sh /

2
templates/tools/dockerfile/grpc_clang_tidy/Dockerfile.template
Unescape View File

@ -14,7 +14,7 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
FROM silkeh/clang:17-bookworm FROM silkeh/clang:18-bookworm
# Install prerequisites for the clang-tidy script # Install prerequisites for the clang-tidy script
RUN apt-get update && apt-get install -y python3 jq git && apt-get clean RUN apt-get update && apt-get install -y python3 jq git && apt-get clean

10
templates/tools/dockerfile/test/sanity/Dockerfile.template
Unescape View File

@ -14,7 +14,7 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
FROM silkeh/clang:17-bookworm FROM silkeh/clang:18-bookworm
<%include file="../../apt_get_basic.include"/> <%include file="../../apt_get_basic.include"/>
@ -22,13 +22,13 @@
# (Bullseye comes with Python 3.9 which isn't supported by pytype yet) # (Bullseye comes with Python 3.9 which isn't supported by pytype yet)
RUN apt update && apt install -y build-essential zlib1g-dev libncurses5-dev libgdbm-dev ${'\\'} RUN apt update && apt install -y build-essential zlib1g-dev libncurses5-dev libgdbm-dev ${'\\'}
libnss3-dev libssl-dev libreadline-dev libffi-dev libbz2-dev libnss3-dev libssl-dev libreadline-dev libffi-dev libbz2-dev
RUN curl -O https://www.python.org/ftp/python/3.7.9/Python-3.7.9.tar.xz && ${'\\'} RUN curl -O https://www.python.org/ftp/python/3.7.17/Python-3.7.17.tar.xz && ${'\\'}
tar -xf Python-3.7.9.tar.xz && ${'\\'} tar -xf Python-3.7.17.tar.xz && ${'\\'}
cd Python-3.7.9 && ${'\\'} cd Python-3.7.17 && ${'\\'}
./configure && ${'\\'} ./configure && ${'\\'}
make -j 4 && ${'\\'} make -j 4 && ${'\\'}
make install make install
RUN curl https://bootstrap.pypa.io/get-pip.py | python3 RUN curl https://bootstrap.pypa.io/pip/3.7/get-pip.py | python3
<%include file="../../gcp_api_libraries.include"/> <%include file="../../gcp_api_libraries.include"/>
<%include file="../../run_tests_addons.include"/> <%include file="../../run_tests_addons.include"/>

754
test/core/end2end/end2end_test_suites.cc
Unescape View File

@ -585,378 +585,367 @@ std::string GetTempDir() {
const std::string temp_dir = GetTempDir(); const std::string temp_dir = GetTempDir();
std::vector<CoreTestConfiguration> DefaultConfigs() { std::vector<CoreTestConfiguration> DefaultConfigs() {
return std::vector<CoreTestConfiguration> { return std::vector<CoreTestConfiguration>{
#ifdef GRPC_POSIX_SOCKET #ifdef GRPC_POSIX_SOCKET
CoreTestConfiguration{"Chttp2Fd", CoreTestConfiguration{"Chttp2Fd",
FEATURE_MASK_IS_HTTP2 | FEATURE_MASK_DO_NOT_FUZZ | FEATURE_MASK_IS_HTTP2 | FEATURE_MASK_DO_NOT_FUZZ |
FEATURE_MASK_EXCLUDE_FROM_EXPERIMENT_RUNS, FEATURE_MASK_EXCLUDE_FROM_EXPERIMENT_RUNS,
nullptr, nullptr,
[](const ChannelArgs&, const ChannelArgs&) { [](const ChannelArgs&, const ChannelArgs&) {
return std::make_unique<FdFixture>(); return std::make_unique<FdFixture>();
}}, }},
#endif #endif
CoreTestConfiguration{ CoreTestConfiguration{
"Chttp2FakeSecurityFullstack", "Chttp2FakeSecurityFullstack",
FEATURE_MASK_SUPPORTS_CLIENT_CHANNEL | FEATURE_MASK_SUPPORTS_CLIENT_CHANNEL |
FEATURE_MASK_SUPPORTS_PER_CALL_CREDENTIALS_LEVEL_INSECURE | FEATURE_MASK_SUPPORTS_PER_CALL_CREDENTIALS_LEVEL_INSECURE |
FEATURE_MASK_IS_HTTP2, FEATURE_MASK_IS_HTTP2,
nullptr, nullptr,
[](const ChannelArgs&, const ChannelArgs&) { [](const ChannelArgs&, const ChannelArgs&) {
return std::make_unique<FakesecFixture>(); return std::make_unique<FakesecFixture>();
}}, }},
CoreTestConfiguration{ CoreTestConfiguration{
"Chttp2Fullstack", "Chttp2Fullstack",
FEATURE_MASK_SUPPORTS_CLIENT_CHANNEL | FEATURE_MASK_IS_HTTP2, FEATURE_MASK_SUPPORTS_CLIENT_CHANNEL | FEATURE_MASK_IS_HTTP2, nullptr,
nullptr, [](const ChannelArgs& /*client_args*/,
[](const ChannelArgs& /*client_args*/, const ChannelArgs& /*server_args*/) {
const ChannelArgs& /*server_args*/) { return std::make_unique<InsecureFixture>();
return std::make_unique<InsecureFixture>(); }},
}}, CoreTestConfiguration{
CoreTestConfiguration{ "Chttp2FullstackCompression",
"Chttp2FullstackCompression", FEATURE_MASK_SUPPORTS_CLIENT_CHANNEL | FEATURE_MASK_IS_HTTP2, nullptr,
FEATURE_MASK_SUPPORTS_CLIENT_CHANNEL | FEATURE_MASK_IS_HTTP2, [](const ChannelArgs&, const ChannelArgs&) {
nullptr, return std::make_unique<CompressionFixture>();
[](const ChannelArgs&, const ChannelArgs&) { }},
return std::make_unique<CompressionFixture>();
}},
#ifdef GPR_LINUX #ifdef GPR_LINUX
CoreTestConfiguration{ CoreTestConfiguration{
"Chttp2FullstackLocalAbstractUdsPercentEncoded", "Chttp2FullstackLocalAbstractUdsPercentEncoded",
FEATURE_MASK_SUPPORTS_CLIENT_CHANNEL | FEATURE_MASK_SUPPORTS_CLIENT_CHANNEL |
FEATURE_MASK_SUPPORTS_PER_CALL_CREDENTIALS | FEATURE_MASK_SUPPORTS_PER_CALL_CREDENTIALS |
FEATURE_MASK_IS_HTTP2 | FEATURE_MASK_DO_NOT_FUZZ | FEATURE_MASK_IS_HTTP2 | FEATURE_MASK_DO_NOT_FUZZ |
FEATURE_MASK_EXCLUDE_FROM_EXPERIMENT_RUNS, FEATURE_MASK_EXCLUDE_FROM_EXPERIMENT_RUNS,
nullptr, nullptr,
[](const ChannelArgs& /*client_args*/, [](const ChannelArgs& /*client_args*/,
const ChannelArgs& /*server_args*/) { const ChannelArgs& /*server_args*/) {
gpr_timespec now = gpr_now(GPR_CLOCK_MONOTONIC); gpr_timespec now = gpr_now(GPR_CLOCK_MONOTONIC);
return std::make_unique<LocalTestFixture>( return std::make_unique<LocalTestFixture>(
absl::StrFormat( absl::StrFormat(
"unix-abstract:grpc_fullstack_test.%%00.%d.%" PRId64 "unix-abstract:grpc_fullstack_test.%%00.%d.%" PRId64
".%" PRId32 ".%" PRId64 ".%" PRId64, ".%" PRId32 ".%" PRId64 ".%" PRId64,
getpid(), now.tv_sec, now.tv_nsec, getpid(), now.tv_sec, now.tv_nsec,
unique.fetch_add(1, std::memory_order_relaxed), Rand()), unique.fetch_add(1, std::memory_order_relaxed), Rand()),
UDS); UDS);
}}, }},
#endif #endif
CoreTestConfiguration{"Chttp2FullstackLocalIpv4", CoreTestConfiguration{"Chttp2FullstackLocalIpv4",
FEATURE_MASK_SUPPORTS_CLIENT_CHANNEL | FEATURE_MASK_SUPPORTS_CLIENT_CHANNEL |
FEATURE_MASK_SUPPORTS_PER_CALL_CREDENTIALS | FEATURE_MASK_SUPPORTS_PER_CALL_CREDENTIALS |
FEATURE_MASK_IS_HTTP2 | FEATURE_MASK_IS_HTTP2 |
FEATURE_MASK_DO_NOT_FUZZ | FEATURE_MASK_DO_NOT_FUZZ |
FEATURE_MASK_EXCLUDE_FROM_EXPERIMENT_RUNS, FEATURE_MASK_EXCLUDE_FROM_EXPERIMENT_RUNS,
nullptr, nullptr,
[](const ChannelArgs& /*client_args*/, [](const ChannelArgs& /*client_args*/,
const ChannelArgs& /*server_args*/) { const ChannelArgs& /*server_args*/) {
int port = grpc_pick_unused_port_or_die(); int port = grpc_pick_unused_port_or_die();
return std::make_unique<LocalTestFixture>( return std::make_unique<LocalTestFixture>(
JoinHostPort("127.0.0.1", port), LOCAL_TCP); JoinHostPort("127.0.0.1", port), LOCAL_TCP);
}}, }},
CoreTestConfiguration{"Chttp2FullstackLocalIpv6", CoreTestConfiguration{"Chttp2FullstackLocalIpv6",
FEATURE_MASK_SUPPORTS_CLIENT_CHANNEL | FEATURE_MASK_SUPPORTS_CLIENT_CHANNEL |
FEATURE_MASK_SUPPORTS_PER_CALL_CREDENTIALS | FEATURE_MASK_SUPPORTS_PER_CALL_CREDENTIALS |
FEATURE_MASK_IS_HTTP2 | FEATURE_MASK_IS_HTTP2 |
FEATURE_MASK_DO_NOT_FUZZ | FEATURE_MASK_DO_NOT_FUZZ |
FEATURE_MASK_EXCLUDE_FROM_EXPERIMENT_RUNS, FEATURE_MASK_EXCLUDE_FROM_EXPERIMENT_RUNS,
nullptr, nullptr,
[](const ChannelArgs& /*client_args*/, [](const ChannelArgs& /*client_args*/,
const ChannelArgs& /*server_args*/) { const ChannelArgs& /*server_args*/) {
int port = grpc_pick_unused_port_or_die(); int port = grpc_pick_unused_port_or_die();
return std::make_unique<LocalTestFixture>( return std::make_unique<LocalTestFixture>(
JoinHostPort("[::1]", port), LOCAL_TCP); JoinHostPort("[::1]", port), LOCAL_TCP);
}}, }},
#ifdef GRPC_HAVE_UNIX_SOCKET #ifdef GRPC_HAVE_UNIX_SOCKET
CoreTestConfiguration{ CoreTestConfiguration{
"Chttp2FullstackLocalUdsPercentEncoded", "Chttp2FullstackLocalUdsPercentEncoded",
FEATURE_MASK_SUPPORTS_CLIENT_CHANNEL | FEATURE_MASK_SUPPORTS_CLIENT_CHANNEL |
FEATURE_MASK_SUPPORTS_PER_CALL_CREDENTIALS | FEATURE_MASK_SUPPORTS_PER_CALL_CREDENTIALS |
FEATURE_MASK_IS_HTTP2 | FEATURE_MASK_DO_NOT_FUZZ | FEATURE_MASK_IS_HTTP2 | FEATURE_MASK_DO_NOT_FUZZ |
FEATURE_MASK_EXCLUDE_FROM_EXPERIMENT_RUNS, FEATURE_MASK_EXCLUDE_FROM_EXPERIMENT_RUNS,
nullptr, nullptr,
[](const ChannelArgs& /*client_args*/, [](const ChannelArgs& /*client_args*/,
const ChannelArgs& /*server_args*/) { const ChannelArgs& /*server_args*/) {
gpr_timespec now = gpr_now(GPR_CLOCK_MONOTONIC); gpr_timespec now = gpr_now(GPR_CLOCK_MONOTONIC);
return std::make_unique<LocalTestFixture>( return std::make_unique<LocalTestFixture>(
absl::StrFormat( absl::StrFormat("unix:%s"
"unix:%s" "grpc_fullstack_test.%%25.%d.%" PRId64
"grpc_fullstack_test.%%25.%d.%" PRId64 ".%" PRId32 ".%" PRId32 ".%" PRId64 ".%" PRId64,
".%" PRId64 ".%" PRId64, temp_dir, getpid(), now.tv_sec, now.tv_nsec,
temp_dir, getpid(), now.tv_sec, now.tv_nsec, unique.fetch_add(1, std::memory_order_relaxed),
unique.fetch_add(1, std::memory_order_relaxed), Rand()), Rand()),
UDS); UDS);
}}, }},
CoreTestConfiguration{ CoreTestConfiguration{
"Chttp2FullstackLocalUds", "Chttp2FullstackLocalUds",
FEATURE_MASK_SUPPORTS_CLIENT_CHANNEL | FEATURE_MASK_SUPPORTS_CLIENT_CHANNEL |
FEATURE_MASK_SUPPORTS_PER_CALL_CREDENTIALS | FEATURE_MASK_SUPPORTS_PER_CALL_CREDENTIALS |
FEATURE_MASK_IS_HTTP2 | FEATURE_MASK_DO_NOT_FUZZ | FEATURE_MASK_IS_HTTP2 | FEATURE_MASK_DO_NOT_FUZZ |
FEATURE_MASK_EXCLUDE_FROM_EXPERIMENT_RUNS, FEATURE_MASK_EXCLUDE_FROM_EXPERIMENT_RUNS,
nullptr, nullptr,
[](const ChannelArgs& /*client_args*/, [](const ChannelArgs& /*client_args*/,
const ChannelArgs& /*server_args*/) { const ChannelArgs& /*server_args*/) {
gpr_timespec now = gpr_now(GPR_CLOCK_REALTIME); gpr_timespec now = gpr_now(GPR_CLOCK_REALTIME);
return std::make_unique<LocalTestFixture>( return std::make_unique<LocalTestFixture>(
absl::StrFormat( absl::StrFormat("unix:%s"
"unix:%s" "grpc_fullstack_test.%d.%" PRId64 ".%" PRId32
"grpc_fullstack_test.%d.%" PRId64 ".%" PRId32 ".%" PRId64 ".%" PRId64 ".%" PRId64,
".%" PRId64, temp_dir, getpid(), now.tv_sec, now.tv_nsec,
temp_dir, getpid(), now.tv_sec, now.tv_nsec, unique.fetch_add(1, std::memory_order_relaxed),
unique.fetch_add(1, std::memory_order_relaxed), Rand()), Rand()),
UDS); UDS);
}}, }},
#endif #endif
CoreTestConfiguration{"Chttp2FullstackNoRetry", CoreTestConfiguration{"Chttp2FullstackNoRetry",
FEATURE_MASK_SUPPORTS_CLIENT_CHANNEL | FEATURE_MASK_SUPPORTS_CLIENT_CHANNEL |
FEATURE_MASK_IS_HTTP2 | FEATURE_MASK_IS_HTTP2 |
FEATURE_MASK_DOES_NOT_SUPPORT_RETRY, FEATURE_MASK_DOES_NOT_SUPPORT_RETRY,
nullptr, nullptr,
[](const ChannelArgs& /*client_args*/, [](const ChannelArgs& /*client_args*/,
const ChannelArgs& /*server_args*/) { const ChannelArgs& /*server_args*/) {
return std::make_unique<NoRetryFixture>(); return std::make_unique<NoRetryFixture>();
}}, }},
CoreTestConfiguration{ CoreTestConfiguration{
"Chttp2FullstackWithCensus", "Chttp2FullstackWithCensus",
FEATURE_MASK_SUPPORTS_CLIENT_CHANNEL | FEATURE_MASK_IS_HTTP2, FEATURE_MASK_SUPPORTS_CLIENT_CHANNEL | FEATURE_MASK_IS_HTTP2, nullptr,
nullptr, [](const ChannelArgs&, const ChannelArgs&) {
[](const ChannelArgs&, const ChannelArgs&) { return std::make_unique<CensusFixture>();
return std::make_unique<CensusFixture>(); }},
}}, CoreTestConfiguration{
CoreTestConfiguration{ "Chttp2FullstackWithProxy",
"Chttp2FullstackWithProxy", FEATURE_MASK_SUPPORTS_REQUEST_PROXYING |
FEATURE_MASK_SUPPORTS_REQUEST_PROXYING | FEATURE_MASK_SUPPORTS_CLIENT_CHANNEL | FEATURE_MASK_IS_HTTP2 |
FEATURE_MASK_SUPPORTS_CLIENT_CHANNEL | FEATURE_MASK_IS_HTTP2 | FEATURE_MASK_DO_NOT_FUZZ,
FEATURE_MASK_DO_NOT_FUZZ, nullptr,
nullptr, [](const ChannelArgs& client_args, const ChannelArgs& server_args) {
[](const ChannelArgs& client_args, const ChannelArgs& server_args) { return std::make_unique<ProxyFixture>(client_args, server_args);
return std::make_unique<ProxyFixture>(client_args, server_args); }},
}}, CoreTestConfiguration{
CoreTestConfiguration{ "Chttp2HttpProxy",
"Chttp2HttpProxy", FEATURE_MASK_SUPPORTS_CLIENT_CHANNEL | FEATURE_MASK_IS_HTTP2 |
FEATURE_MASK_SUPPORTS_CLIENT_CHANNEL | FEATURE_MASK_IS_HTTP2 | FEATURE_MASK_DO_NOT_FUZZ,
FEATURE_MASK_DO_NOT_FUZZ, nullptr,
nullptr, [](const ChannelArgs& client_args, const ChannelArgs&) {
[](const ChannelArgs& client_args, const ChannelArgs&) { return std::make_unique<HttpProxyFilter>(client_args);
return std::make_unique<HttpProxyFilter>(client_args); }},
}}, CoreTestConfiguration{
CoreTestConfiguration{ "Chttp2SslProxy",
"Chttp2SslProxy", FEATURE_MASK_SUPPORTS_CLIENT_CHANNEL | FEATURE_MASK_IS_SECURE |
FEATURE_MASK_SUPPORTS_CLIENT_CHANNEL | FEATURE_MASK_IS_SECURE | FEATURE_MASK_SUPPORTS_REQUEST_PROXYING |
FEATURE_MASK_SUPPORTS_REQUEST_PROXYING | FEATURE_MASK_SUPPORTS_PER_CALL_CREDENTIALS |
FEATURE_MASK_SUPPORTS_PER_CALL_CREDENTIALS | FEATURE_MASK_IS_HTTP2 | FEATURE_MASK_DO_NOT_FUZZ,
FEATURE_MASK_IS_HTTP2 | FEATURE_MASK_DO_NOT_FUZZ, "foo.test.google.fr",
"foo.test.google.fr", [](const ChannelArgs& client_args, const ChannelArgs& server_args) {
[](const ChannelArgs& client_args, const ChannelArgs& server_args) { return std::make_unique<SslProxyFixture>(client_args, server_args);
return std::make_unique<SslProxyFixture>(client_args, }},
server_args); CoreTestConfiguration{
}}, "Chttp2InsecureCredentials",
CoreTestConfiguration{ FEATURE_MASK_SUPPORTS_CLIENT_CHANNEL |
"Chttp2InsecureCredentials", FEATURE_MASK_SUPPORTS_PER_CALL_CREDENTIALS_LEVEL_INSECURE |
FEATURE_MASK_SUPPORTS_CLIENT_CHANNEL | FEATURE_MASK_IS_HTTP2 | FEATURE_MASK_EXCLUDE_FROM_EXPERIMENT_RUNS,
FEATURE_MASK_SUPPORTS_PER_CALL_CREDENTIALS_LEVEL_INSECURE | nullptr,
FEATURE_MASK_IS_HTTP2 | [](const ChannelArgs&, const ChannelArgs&) {
FEATURE_MASK_EXCLUDE_FROM_EXPERIMENT_RUNS, return std::make_unique<InsecureCredsFixture>();
nullptr, },
[](const ChannelArgs&, const ChannelArgs&) { },
return std::make_unique<InsecureCredsFixture>(); CoreTestConfiguration{
}, "Chttp2SimpleSslWithOauth2FullstackTls12",
}, FEATURE_MASK_IS_SECURE | FEATURE_MASK_SUPPORTS_PER_CALL_CREDENTIALS |
CoreTestConfiguration{ FEATURE_MASK_SUPPORTS_CLIENT_CHANNEL | FEATURE_MASK_IS_HTTP2 |
"Chttp2SimpleSslWithOauth2FullstackTls12", FEATURE_MASK_EXCLUDE_FROM_EXPERIMENT_RUNS,
FEATURE_MASK_IS_SECURE | "foo.test.google.fr",
FEATURE_MASK_SUPPORTS_PER_CALL_CREDENTIALS | [](const ChannelArgs&, const ChannelArgs&) {
FEATURE_MASK_SUPPORTS_CLIENT_CHANNEL | FEATURE_MASK_IS_HTTP2 | return std::make_unique<Oauth2Fixture>(grpc_tls_version::TLS1_2);
FEATURE_MASK_EXCLUDE_FROM_EXPERIMENT_RUNS, }},
"foo.test.google.fr", CoreTestConfiguration{
[](const ChannelArgs&, const ChannelArgs&) { "Chttp2SimpleSslWithOauth2FullstackTls13",
return std::make_unique<Oauth2Fixture>(grpc_tls_version::TLS1_2); FEATURE_MASK_IS_SECURE | FEATURE_MASK_SUPPORTS_PER_CALL_CREDENTIALS |
}}, FEATURE_MASK_SUPPORTS_CLIENT_CHANNEL | FEATURE_MASK_IS_HTTP2,
CoreTestConfiguration{ "foo.test.google.fr",
"Chttp2SimpleSslWithOauth2FullstackTls13", [](const ChannelArgs&, const ChannelArgs&) {
FEATURE_MASK_IS_SECURE | return std::make_unique<Oauth2Fixture>(grpc_tls_version::TLS1_3);
FEATURE_MASK_SUPPORTS_PER_CALL_CREDENTIALS | }},
FEATURE_MASK_SUPPORTS_CLIENT_CHANNEL | FEATURE_MASK_IS_HTTP2, CoreTestConfiguration{
"foo.test.google.fr", "Chttp2SimplSslFullstackTls12",
[](const ChannelArgs&, const ChannelArgs&) { FEATURE_MASK_IS_SECURE | FEATURE_MASK_SUPPORTS_PER_CALL_CREDENTIALS |
return std::make_unique<Oauth2Fixture>(grpc_tls_version::TLS1_3); FEATURE_MASK_SUPPORTS_CLIENT_CHANNEL | FEATURE_MASK_IS_HTTP2 |
}}, FEATURE_MASK_EXCLUDE_FROM_EXPERIMENT_RUNS,
CoreTestConfiguration{ "foo.test.google.fr",
"Chttp2SimplSslFullstackTls12", [](const ChannelArgs&, const ChannelArgs&) {
FEATURE_MASK_IS_SECURE | return std::make_unique<SslTlsFixture>(grpc_tls_version::TLS1_2);
FEATURE_MASK_SUPPORTS_PER_CALL_CREDENTIALS | }},
FEATURE_MASK_SUPPORTS_CLIENT_CHANNEL | FEATURE_MASK_IS_HTTP2 | CoreTestConfiguration{
FEATURE_MASK_EXCLUDE_FROM_EXPERIMENT_RUNS, "Chttp2SimplSslFullstackTls13",
"foo.test.google.fr", FEATURE_MASK_IS_SECURE | FEATURE_MASK_SUPPORTS_PER_CALL_CREDENTIALS |
[](const ChannelArgs&, const ChannelArgs&) { FEATURE_MASK_SUPPORTS_CLIENT_CHANNEL |
return std::make_unique<SslTlsFixture>(grpc_tls_version::TLS1_2); FEATURE_MASK_DOES_NOT_SUPPORT_CLIENT_HANDSHAKE_COMPLETE_FIRST |
}}, FEATURE_MASK_IS_HTTP2,
CoreTestConfiguration{ "foo.test.google.fr",
"Chttp2SimplSslFullstackTls13", [](const ChannelArgs&, const ChannelArgs&) {
FEATURE_MASK_IS_SECURE | return std::make_unique<SslTlsFixture>(grpc_tls_version::TLS1_3);
FEATURE_MASK_SUPPORTS_PER_CALL_CREDENTIALS | }},
FEATURE_MASK_SUPPORTS_CLIENT_CHANNEL | CoreTestConfiguration{"Chttp2SocketPair",
FEATURE_MASK_DOES_NOT_SUPPORT_CLIENT_HANDSHAKE_COMPLETE_FIRST | FEATURE_MASK_IS_HTTP2 | FEATURE_MASK_DO_NOT_FUZZ |
FEATURE_MASK_IS_HTTP2, FEATURE_MASK_EXCLUDE_FROM_EXPERIMENT_RUNS,
"foo.test.google.fr", nullptr,
[](const ChannelArgs&, const ChannelArgs&) { [](const ChannelArgs&, const ChannelArgs&) {
return std::make_unique<SslTlsFixture>(grpc_tls_version::TLS1_3); return std::make_unique<SockpairFixture>(
}}, ChannelArgs());
CoreTestConfiguration{ }},
"Chttp2SocketPair", CoreTestConfiguration{
FEATURE_MASK_IS_HTTP2 | FEATURE_MASK_DO_NOT_FUZZ | "Chttp2SocketPair1ByteAtATime",
FEATURE_MASK_EXCLUDE_FROM_EXPERIMENT_RUNS, FEATURE_MASK_IS_HTTP2 | FEATURE_MASK_1BYTE_AT_A_TIME |
nullptr, FEATURE_MASK_DO_NOT_FUZZ |
[](const ChannelArgs&, const ChannelArgs&) { FEATURE_MASK_EXCLUDE_FROM_EXPERIMENT_RUNS,
return std::make_unique<SockpairFixture>(ChannelArgs()); nullptr,
}}, [](const ChannelArgs&, const ChannelArgs&) {
CoreTestConfiguration{ return std::make_unique<SockpairFixture>(
"Chttp2SocketPair1ByteAtATime", ChannelArgs()
FEATURE_MASK_IS_HTTP2 | FEATURE_MASK_1BYTE_AT_A_TIME | .Set(GRPC_ARG_TCP_READ_CHUNK_SIZE, 1)
FEATURE_MASK_DO_NOT_FUZZ | .Set(GRPC_ARG_TCP_MIN_READ_CHUNK_SIZE, 1)
FEATURE_MASK_EXCLUDE_FROM_EXPERIMENT_RUNS, .Set(GRPC_ARG_TCP_MAX_READ_CHUNK_SIZE, 1));
nullptr, }},
[](const ChannelArgs&, const ChannelArgs&) { CoreTestConfiguration{
return std::make_unique<SockpairFixture>( "Chttp2SocketPairMinstack",
ChannelArgs() FEATURE_MASK_IS_HTTP2 | FEATURE_MASK_IS_MINSTACK |
.Set(GRPC_ARG_TCP_READ_CHUNK_SIZE, 1) FEATURE_MASK_DO_NOT_FUZZ,
.Set(GRPC_ARG_TCP_MIN_READ_CHUNK_SIZE, 1) nullptr,
.Set(GRPC_ARG_TCP_MAX_READ_CHUNK_SIZE, 1)); [](const ChannelArgs&, const ChannelArgs&) {
}}, return std::make_unique<SockpairWithMinstackFixture>(ChannelArgs());
CoreTestConfiguration{ }},
"Chttp2SocketPairMinstack", CoreTestConfiguration{
FEATURE_MASK_IS_HTTP2 | FEATURE_MASK_IS_MINSTACK | "Inproc",
FEATURE_MASK_DO_NOT_FUZZ, FEATURE_MASK_DOES_NOT_SUPPORT_WRITE_BUFFERING,
nullptr, nullptr,
[](const ChannelArgs&, const ChannelArgs&) { [](const ChannelArgs&, const ChannelArgs&) {
return std::make_unique<SockpairWithMinstackFixture>( return std::make_unique<InprocFixture>(false);
ChannelArgs()); },
}}, },
CoreTestConfiguration{ CoreTestConfiguration{
"Inproc", "InprocWithPromises",
FEATURE_MASK_DOES_NOT_SUPPORT_WRITE_BUFFERING, FEATURE_MASK_DOES_NOT_SUPPORT_WRITE_BUFFERING |
nullptr, FEATURE_MASK_IS_CALL_V3,
[](const ChannelArgs&, const ChannelArgs&) { nullptr,
return std::make_unique<InprocFixture>(false); [](const ChannelArgs&, const ChannelArgs&) {
}, return std::make_unique<InprocFixture>(true);
}, },
CoreTestConfiguration{ },
"InprocWithPromises", CoreTestConfiguration{
FEATURE_MASK_DOES_NOT_SUPPORT_WRITE_BUFFERING | "Chttp2SslCredReloadTls12",
FEATURE_MASK_IS_CALL_V3, FEATURE_MASK_IS_SECURE | FEATURE_MASK_SUPPORTS_PER_CALL_CREDENTIALS |
nullptr, FEATURE_MASK_SUPPORTS_CLIENT_CHANNEL | FEATURE_MASK_IS_HTTP2 |
[](const ChannelArgs&, const ChannelArgs&) { FEATURE_MASK_EXCLUDE_FROM_EXPERIMENT_RUNS,
return std::make_unique<InprocFixture>(true); "foo.test.google.fr",
}, [](const ChannelArgs&, const ChannelArgs&) {
}, return std::make_unique<SslCredReloadFixture>(TLS1_2);
CoreTestConfiguration{ }},
"Chttp2SslCredReloadTls12", CoreTestConfiguration{
FEATURE_MASK_IS_SECURE | "Chttp2SslCredReloadTls13",
FEATURE_MASK_SUPPORTS_PER_CALL_CREDENTIALS | FEATURE_MASK_IS_SECURE | FEATURE_MASK_IS_HTTP2 |
FEATURE_MASK_SUPPORTS_CLIENT_CHANNEL | FEATURE_MASK_IS_HTTP2 | FEATURE_MASK_SUPPORTS_PER_CALL_CREDENTIALS |
FEATURE_MASK_EXCLUDE_FROM_EXPERIMENT_RUNS, FEATURE_MASK_SUPPORTS_CLIENT_CHANNEL |
"foo.test.google.fr", FEATURE_MASK_DOES_NOT_SUPPORT_CLIENT_HANDSHAKE_COMPLETE_FIRST,
[](const ChannelArgs&, const ChannelArgs&) { "foo.test.google.fr",
return std::make_unique<SslCredReloadFixture>(TLS1_2); [](const ChannelArgs&, const ChannelArgs&) {
}}, return std::make_unique<SslCredReloadFixture>(TLS1_3);
CoreTestConfiguration{ }},
"Chttp2SslCredReloadTls13", CoreTestConfiguration{
FEATURE_MASK_IS_SECURE | FEATURE_MASK_IS_HTTP2 | // client: certificate watcher provider + async external verifier
FEATURE_MASK_SUPPORTS_PER_CALL_CREDENTIALS | // server: certificate watcher provider + async external verifier
FEATURE_MASK_SUPPORTS_CLIENT_CHANNEL | // extra: TLS 1.3
FEATURE_MASK_DOES_NOT_SUPPORT_CLIENT_HANDSHAKE_COMPLETE_FIRST, "Chttp2CertWatcherProviderAsyncVerifierTls13",
"foo.test.google.fr", kH2TLSFeatureMask | FEATURE_MASK_DO_NOT_FUZZ |
[](const ChannelArgs&, const ChannelArgs&) { FEATURE_MASK_EXCLUDE_FROM_EXPERIMENT_RUNS,
return std::make_unique<SslCredReloadFixture>(TLS1_3); "foo.test.google.fr",
}}, [](const ChannelArgs&, const ChannelArgs&) {
CoreTestConfiguration{ return std::make_unique<TlsFixture>(
// client: certificate watcher provider + async external verifier SecurityPrimitives::TlsVersion::V_13,
// server: certificate watcher provider + async external verifier SecurityPrimitives::ProviderType::FILE_PROVIDER,
// extra: TLS 1.3 SecurityPrimitives::VerifierType::EXTERNAL_ASYNC_VERIFIER);
"Chttp2CertWatcherProviderAsyncVerifierTls13", },
kH2TLSFeatureMask | FEATURE_MASK_DO_NOT_FUZZ | },
FEATURE_MASK_EXCLUDE_FROM_EXPERIMENT_RUNS, CoreTestConfiguration{
"foo.test.google.fr", // client: certificate watcher provider + hostname verifier
[](const ChannelArgs&, const ChannelArgs&) { // server: certificate watcher provider + sync external verifier
return std::make_unique<TlsFixture>( // extra: TLS 1.2
SecurityPrimitives::TlsVersion::V_13, "Chttp2CertWatcherProviderSyncVerifierTls12",
SecurityPrimitives::ProviderType::FILE_PROVIDER, kH2TLSFeatureMask | FEATURE_MASK_DO_NOT_FUZZ |
SecurityPrimitives::VerifierType::EXTERNAL_ASYNC_VERIFIER); FEATURE_MASK_EXCLUDE_FROM_EXPERIMENT_RUNS,
}, "foo.test.google.fr",
}, [](const ChannelArgs&, const ChannelArgs&) {
CoreTestConfiguration{ return std::make_unique<TlsFixture>(
// client: certificate watcher provider + hostname verifier SecurityPrimitives::TlsVersion::V_12,
// server: certificate watcher provider + sync external verifier SecurityPrimitives::ProviderType::FILE_PROVIDER,
// extra: TLS 1.2 SecurityPrimitives::VerifierType::HOSTNAME_VERIFIER);
"Chttp2CertWatcherProviderSyncVerifierTls12", },
kH2TLSFeatureMask | FEATURE_MASK_DO_NOT_FUZZ | },
FEATURE_MASK_EXCLUDE_FROM_EXPERIMENT_RUNS, CoreTestConfiguration{
"foo.test.google.fr", // client: static data provider + sync external verifier
[](const ChannelArgs&, const ChannelArgs&) { // server: static data provider + sync external verifier
return std::make_unique<TlsFixture>( // extra: TLS 1.2
SecurityPrimitives::TlsVersion::V_12, "Chttp2SimpleSslFullstack",
SecurityPrimitives::ProviderType::FILE_PROVIDER, kH2TLSFeatureMask,
SecurityPrimitives::VerifierType::HOSTNAME_VERIFIER); "foo.test.google.fr",
}, [](const ChannelArgs&, const ChannelArgs&) {
}, return std::make_unique<TlsFixture>(
CoreTestConfiguration{ SecurityPrimitives::TlsVersion::V_12,
// client: static data provider + sync external verifier SecurityPrimitives::ProviderType::STATIC_PROVIDER,
// server: static data provider + sync external verifier SecurityPrimitives::VerifierType::EXTERNAL_SYNC_VERIFIER);
// extra: TLS 1.2 },
"Chttp2SimpleSslFullstack", },
kH2TLSFeatureMask, CoreTestConfiguration{
"foo.test.google.fr", // client: static data provider + async external verifier
[](const ChannelArgs&, const ChannelArgs&) { // server: static data provider + async external verifier
return std::make_unique<TlsFixture>( // extra: TLS 1.3
SecurityPrimitives::TlsVersion::V_12, "Chttp2StaticProviderAsyncVerifierTls13",
SecurityPrimitives::ProviderType::STATIC_PROVIDER, kH2TLSFeatureMask | FEATURE_MASK_DO_NOT_FUZZ |
SecurityPrimitives::VerifierType::EXTERNAL_SYNC_VERIFIER); FEATURE_MASK_EXCLUDE_FROM_EXPERIMENT_RUNS,
}, "foo.test.google.fr",
}, [](const ChannelArgs&, const ChannelArgs&) {
CoreTestConfiguration{ return std::make_unique<TlsFixture>(
// client: static data provider + async external verifier SecurityPrimitives::TlsVersion::V_13,
// server: static data provider + async external verifier SecurityPrimitives::ProviderType::STATIC_PROVIDER,
// extra: TLS 1.3 SecurityPrimitives::VerifierType::EXTERNAL_ASYNC_VERIFIER);
"Chttp2StaticProviderAsyncVerifierTls13", },
kH2TLSFeatureMask | FEATURE_MASK_DO_NOT_FUZZ | },
FEATURE_MASK_EXCLUDE_FROM_EXPERIMENT_RUNS,
"foo.test.google.fr",
[](const ChannelArgs&, const ChannelArgs&) {
return std::make_unique<TlsFixture>(
SecurityPrimitives::TlsVersion::V_13,
SecurityPrimitives::ProviderType::STATIC_PROVIDER,
SecurityPrimitives::VerifierType::EXTERNAL_ASYNC_VERIFIER);
},
},
#ifdef GPR_LINUX #ifdef GPR_LINUX
CoreTestConfiguration{ CoreTestConfiguration{
"Chttp2FullstackUdsAbstractNamespace", "Chttp2FullstackUdsAbstractNamespace",
FEATURE_MASK_SUPPORTS_CLIENT_CHANNEL | FEATURE_MASK_IS_HTTP2 | FEATURE_MASK_SUPPORTS_CLIENT_CHANNEL | FEATURE_MASK_IS_HTTP2 |
FEATURE_MASK_DO_NOT_FUZZ | FEATURE_MASK_DO_NOT_FUZZ |
FEATURE_MASK_EXCLUDE_FROM_EXPERIMENT_RUNS, FEATURE_MASK_EXCLUDE_FROM_EXPERIMENT_RUNS,
nullptr, nullptr,
[](const ChannelArgs&, const ChannelArgs&) { [](const ChannelArgs&, const ChannelArgs&) {
gpr_timespec now = gpr_now(GPR_CLOCK_REALTIME); gpr_timespec now = gpr_now(GPR_CLOCK_REALTIME);
return std::make_unique<InsecureFixture>(absl::StrFormat( return std::make_unique<InsecureFixture>(absl::StrFormat(
"unix-abstract:grpc_fullstack_test.%d.%" PRId64 ".%" PRId32 "unix-abstract:grpc_fullstack_test.%d.%" PRId64 ".%" PRId32
".%" PRId64, ".%" PRId64,
getpid(), now.tv_sec, now.tv_nsec, getpid(), now.tv_sec, now.tv_nsec,
unique.fetch_add(1, std::memory_order_relaxed))); unique.fetch_add(1, std::memory_order_relaxed)));
}}, }},
#endif #endif
#ifdef GRPC_HAVE_UNIX_SOCKET #ifdef GRPC_HAVE_UNIX_SOCKET
CoreTestConfiguration{ CoreTestConfiguration{
"Chttp2FullstackUds", "Chttp2FullstackUds",
FEATURE_MASK_SUPPORTS_CLIENT_CHANNEL | FEATURE_MASK_IS_HTTP2 | FEATURE_MASK_SUPPORTS_CLIENT_CHANNEL | FEATURE_MASK_IS_HTTP2 |
FEATURE_MASK_DO_NOT_FUZZ, FEATURE_MASK_DO_NOT_FUZZ,
nullptr, nullptr,
[](const ChannelArgs&, const ChannelArgs&) { [](const ChannelArgs&, const ChannelArgs&) {
gpr_timespec now = gpr_now(GPR_CLOCK_REALTIME); gpr_timespec now = gpr_now(GPR_CLOCK_REALTIME);
return std::make_unique<InsecureFixture>(absl::StrFormat( return std::make_unique<InsecureFixture>(absl::StrFormat(
"unix:%s" "unix:%s"
"grpc_fullstack_test.%d.%" PRId64 ".%" PRId32 ".%" PRId64 "grpc_fullstack_test.%d.%" PRId64 ".%" PRId32 ".%" PRId64
".%" PRId64, ".%" PRId64,
temp_dir, getpid(), now.tv_sec, now.tv_nsec, temp_dir, getpid(), now.tv_sec, now.tv_nsec,
unique.fetch_add(1, std::memory_order_relaxed), Rand())); unique.fetch_add(1, std::memory_order_relaxed), Rand()));
}}, }},
#endif #endif
// TODO(ctiller): these got inadvertently disabled when the project // TODO(ctiller): these got inadvertently disabled when the project
// switched to Bazel in 2016, and have not been re-enabled since and are now // switched to Bazel in 2016, and have not been re-enabled since and are now
@ -983,30 +972,27 @@ std::vector<CoreTestConfiguration> DefaultConfigs() {
}}, }},
#endif #endif
#ifdef GRPC_POSIX_WAKEUP_FD #ifdef GRPC_POSIX_WAKEUP_FD
CoreTestConfiguration{ CoreTestConfiguration{
"Chttp2FullstackWithPipeWakeup", "Chttp2FullstackWithPipeWakeup",
FEATURE_MASK_SUPPORTS_CLIENT_CHANNEL | FEATURE_MASK_IS_HTTP2 | FEATURE_MASK_SUPPORTS_CLIENT_CHANNEL | FEATURE_MASK_IS_HTTP2 |
FEATURE_MASK_DO_NOT_FUZZ | FEATURE_MASK_DO_NOT_FUZZ |
FEATURE_MASK_EXCLUDE_FROM_EXPERIMENT_RUNS, FEATURE_MASK_EXCLUDE_FROM_EXPERIMENT_RUNS,
nullptr,
[](const ChannelArgs& /*client_args*/,
const ChannelArgs& /*server_args*/) {
return std::make_unique<InsecureFixtureWithPipeForWakeupFd>();
}},
#endif
CoreTestConfiguration {
"ChaoticGoodFullStack",
FEATURE_MASK_SUPPORTS_CLIENT_CHANNEL |
FEATURE_MASK_DOES_NOT_SUPPORT_RETRY |
FEATURE_MASK_DOES_NOT_SUPPORT_WRITE_BUFFERING |
FEATURE_MASK_IS_CALL_V3,
nullptr, nullptr,
[](const ChannelArgs& /*client_args*/, [](const ChannelArgs& /*client_args*/,
const ChannelArgs& /*server_args*/) { const ChannelArgs& /*server_args*/) {
return std::make_unique<ChaoticGoodFixture>(); return std::make_unique<InsecureFixtureWithPipeForWakeupFd>();
} }},
} #endif
}; CoreTestConfiguration{"ChaoticGoodFullStack",
FEATURE_MASK_SUPPORTS_CLIENT_CHANNEL |
FEATURE_MASK_DOES_NOT_SUPPORT_RETRY |
FEATURE_MASK_DOES_NOT_SUPPORT_WRITE_BUFFERING |
FEATURE_MASK_IS_CALL_V3,
nullptr,
[](const ChannelArgs& /*client_args*/,
const ChannelArgs& /*server_args*/) {
return std::make_unique<ChaoticGoodFixture>();
}}};
} }
std::vector<CoreTestConfiguration> AllConfigs() { std::vector<CoreTestConfiguration> AllConfigs() {

14
test/core/end2end/h2_ssl_cert_test.cc
Unescape View File

@ -140,14 +140,12 @@ class TestFixture : public SecureFixture {
typedef enum { SUCCESS, FAIL } test_result; typedef enum { SUCCESS, FAIL } test_result;
#define SSL_TEST(request_type, cert_type, result) \ #define SSL_TEST(request_type, cert_type, result) \
{ \ {{TEST_NAME(request_type, cert_type, result), \
{TEST_NAME(request_type, cert_type, result), \ FEATURE_MASK_SUPPORTS_PER_CALL_CREDENTIALS | \
FEATURE_MASK_SUPPORTS_PER_CALL_CREDENTIALS | \ FEATURE_MASK_SUPPORTS_CLIENT_CHANNEL, \
FEATURE_MASK_SUPPORTS_CLIENT_CHANNEL, \ "foo.test.google.fr", TestFixture::MakeFactory(request_type, cert_type)}, \
"foo.test.google.fr", TestFixture::MakeFactory(request_type, cert_type)}, \ result}
result \
}
// All test configurations // All test configurations
struct CoreTestConfigWrapper { struct CoreTestConfigWrapper {

2
test/core/event_engine/default_engine_methods_test.cc
Unescape View File

@ -69,7 +69,7 @@ class DefaultEngineTest : public testing::Test {
const DNSResolver::ResolverOptions& /* options */) override { const DNSResolver::ResolverOptions& /* options */) override {
return nullptr; return nullptr;
}; };
void Run(Closure* /* closure */) override{}; void Run(Closure* /* closure */) override {};
void Run(absl::AnyInvocable<void()> /* closure */) override{}; void Run(absl::AnyInvocable<void()> /* closure */) override{};
TaskHandle RunAfter(Duration /* when */, Closure* /* closure */) override { TaskHandle RunAfter(Duration /* when */, Closure* /* closure */) override {
return {-1, -1}; return {-1, -1};

2
test/core/event_engine/posix/posix_engine_test_utils.h
Unescape View File

@ -30,7 +30,7 @@ class TestScheduler : public Scheduler {
public: public:
explicit TestScheduler(grpc_event_engine::experimental::EventEngine* engine) explicit TestScheduler(grpc_event_engine::experimental::EventEngine* engine)
: engine_(engine) {} : engine_(engine) {}
TestScheduler() : engine_(nullptr){}; TestScheduler() : engine_(nullptr) {};
void ChangeCurrentEventEngine( void ChangeCurrentEventEngine(
grpc_event_engine::experimental::EventEngine* engine) { grpc_event_engine::experimental::EventEngine* engine) {
engine_ = engine; engine_ = engine;

3
test/core/gprpp/match_test.cc
Unescape View File

@ -54,8 +54,7 @@ TEST(MatchTest, TestVoidReturn) {
TEST(MatchTest, TestMutable) { TEST(MatchTest, TestMutable) {
absl::variant<int, double> v = 1.9; absl::variant<int, double> v = 1.9;
MatchMutable( MatchMutable(&v, [](int*) { abort(); }, [](double* x) { *x = 0.0; });
&v, [](int*) { abort(); }, [](double* x) { *x = 0.0; });
EXPECT_EQ(v, (absl::variant<int, double>(0.0))); EXPECT_EQ(v, (absl::variant<int, double>(0.0)));
} }

6
test/core/iomgr/pollset_windows_starvation_test.cc
Unescape View File

@ -112,8 +112,7 @@ int main(int argc, char** argv) {
gpr_mu_lock(&params.mu); gpr_mu_lock(&params.mu);
while ( while (
params.queuing != THREADS && params.queuing != THREADS &&
!gpr_cv_wait(&params.cv, &params.mu, gpr_inf_future(GPR_CLOCK_REALTIME))) !gpr_cv_wait(&params.cv, &params.mu, gpr_inf_future(GPR_CLOCK_REALTIME)));
;
gpr_mu_unlock(&params.mu); gpr_mu_unlock(&params.mu);
// Wait for the mutexes to be released. This indicates that the threads have // Wait for the mutexes to be released. This indicates that the threads have
@ -133,8 +132,7 @@ int main(int argc, char** argv) {
gpr_mu_lock(&params.mu); gpr_mu_lock(&params.mu);
while ( while (
params.complete != THREADS && params.complete != THREADS &&
!gpr_cv_wait(&params.cv, &params.mu, gpr_inf_future(GPR_CLOCK_REALTIME))) !gpr_cv_wait(&params.cv, &params.mu, gpr_inf_future(GPR_CLOCK_REALTIME)));
;
gpr_mu_unlock(&params.mu); gpr_mu_unlock(&params.mu);
for (auto& t : threads) t.Join(); for (auto& t : threads) t.Join();

3
test/core/promise/bm_party.cc
Unescape View File

@ -34,8 +34,7 @@ BENCHMARK(BM_PartyCreate);
void BM_AddParticipant(benchmark::State& state) { void BM_AddParticipant(benchmark::State& state) {
auto party = Party::Make(SimpleArenaAllocator()->MakeArena()); auto party = Party::Make(SimpleArenaAllocator()->MakeArena());
for (auto _ : state) { for (auto _ : state) {
party->Spawn( party->Spawn("participant", []() { return Success{}; }, [](StatusFlag) {});
"participant", []() { return Success{}; }, [](StatusFlag) {});
} }
} }
BENCHMARK(BM_AddParticipant); BENCHMARK(BM_AddParticipant);

8
test/core/promise/if_test.cc
Unescape View File

@ -51,15 +51,11 @@ TEST(IfTest, ChooseFailure) {
} }
TEST(IfTest, ImmediateChooseTrue) { TEST(IfTest, ImmediateChooseTrue) {
EXPECT_EQ(If( EXPECT_EQ(If(true, []() { return 1; }, []() { return 2; })(), Poll<int>(1));
true, []() { return 1; }, []() { return 2; })(),
Poll<int>(1));
} }
TEST(IfTest, ImmediateChooseFalse) { TEST(IfTest, ImmediateChooseFalse) {
EXPECT_EQ(If( EXPECT_EQ(If(false, []() { return 1; }, []() { return 2; })(), Poll<int>(2));
false, []() { return 1; }, []() { return 2; })(),
Poll<int>(2));
} }
} // namespace grpc_core } // namespace grpc_core

44
test/core/transport/chttp2/ping_callbacks_test.cc
Unescape View File

@ -118,9 +118,7 @@ TEST(PingCallbacksTest, PingRoundtrips) {
// request // request
EXPECT_CALL(event_engine, RunAfter(EventEngine::Duration(Duration::Hours(24)), EXPECT_CALL(event_engine, RunAfter(EventEngine::Duration(Duration::Hours(24)),
Matcher<absl::AnyInvocable<void()>>(_))) Matcher<absl::AnyInvocable<void()>>(_)))
.WillOnce([]() { .WillOnce([]() { return EventEngine::TaskHandle{123, 456}; });
return EventEngine::TaskHandle{123, 456};
});
auto id = callbacks.StartPing(bitgen); auto id = callbacks.StartPing(bitgen);
callbacks.OnPingTimeout(Duration::Hours(24), &event_engine, callbacks.OnPingTimeout(Duration::Hours(24), &event_engine,
[] { Crash("should not reach here"); }); [] { Crash("should not reach here"); });
@ -198,9 +196,7 @@ TEST(PingCallbacksTest, DuplicatePingIdFlagsError) {
EXPECT_FALSE(acked); EXPECT_FALSE(acked);
EXPECT_CALL(event_engine, RunAfter(EventEngine::Duration(Duration::Hours(24)), EXPECT_CALL(event_engine, RunAfter(EventEngine::Duration(Duration::Hours(24)),
Matcher<absl::AnyInvocable<void()>>(_))) Matcher<absl::AnyInvocable<void()>>(_)))
.WillOnce([]() { .WillOnce([]() { return EventEngine::TaskHandle{123, 456}; });
return EventEngine::TaskHandle{123, 456};
});
auto id = callbacks.StartPing(bitgen); auto id = callbacks.StartPing(bitgen);
callbacks.OnPingTimeout(Duration::Hours(24), &event_engine, callbacks.OnPingTimeout(Duration::Hours(24), &event_engine,
[] { Crash("should not reach here"); }); [] { Crash("should not reach here"); });
@ -240,9 +236,7 @@ TEST(PingCallbacksTest, OnPingAckCanPiggybackInflightPings) {
EXPECT_FALSE(acked_second); EXPECT_FALSE(acked_second);
EXPECT_CALL(event_engine, RunAfter(EventEngine::Duration(Duration::Hours(24)), EXPECT_CALL(event_engine, RunAfter(EventEngine::Duration(Duration::Hours(24)),
Matcher<absl::AnyInvocable<void()>>(_))) Matcher<absl::AnyInvocable<void()>>(_)))
.WillOnce([]() { .WillOnce([]() { return EventEngine::TaskHandle{123, 456}; });
return EventEngine::TaskHandle{123, 456};
});
auto id = callbacks.StartPing(bitgen); auto id = callbacks.StartPing(bitgen);
callbacks.OnPingTimeout(Duration::Hours(24), &event_engine, callbacks.OnPingTimeout(Duration::Hours(24), &event_engine,
[] { Crash("should not reach here"); }); [] { Crash("should not reach here"); });
@ -281,9 +275,7 @@ TEST(PingCallbacksTest, PingAckRoundtrips) {
EXPECT_FALSE(acked); EXPECT_FALSE(acked);
EXPECT_CALL(event_engine, RunAfter(EventEngine::Duration(Duration::Hours(24)), EXPECT_CALL(event_engine, RunAfter(EventEngine::Duration(Duration::Hours(24)),
Matcher<absl::AnyInvocable<void()>>(_))) Matcher<absl::AnyInvocable<void()>>(_)))
.WillOnce([]() { .WillOnce([]() { return EventEngine::TaskHandle{123, 456}; });
return EventEngine::TaskHandle{123, 456};
});
auto id = callbacks.StartPing(bitgen); auto id = callbacks.StartPing(bitgen);
callbacks.OnPingTimeout(Duration::Hours(24), &event_engine, callbacks.OnPingTimeout(Duration::Hours(24), &event_engine,
[] { Crash("should not reach here"); }); [] { Crash("should not reach here"); });
@ -321,9 +313,7 @@ TEST(PingCallbacksTest, MultiPingRoundtrips) {
EXPECT_FALSE(acked2); EXPECT_FALSE(acked2);
EXPECT_CALL(event_engine, RunAfter(EventEngine::Duration(Duration::Hours(24)), EXPECT_CALL(event_engine, RunAfter(EventEngine::Duration(Duration::Hours(24)),
Matcher<absl::AnyInvocable<void()>>(_))) Matcher<absl::AnyInvocable<void()>>(_)))
.WillOnce([]() { .WillOnce([]() { return EventEngine::TaskHandle{123, 456}; });
return EventEngine::TaskHandle{123, 456};
});
auto id1 = callbacks.StartPing(bitgen); auto id1 = callbacks.StartPing(bitgen);
callbacks.OnPingTimeout(Duration::Hours(24), &event_engine, callbacks.OnPingTimeout(Duration::Hours(24), &event_engine,
[] { Crash("should not reach here"); }); [] { Crash("should not reach here"); });
@ -348,9 +338,7 @@ TEST(PingCallbacksTest, MultiPingRoundtrips) {
EXPECT_FALSE(acked2); EXPECT_FALSE(acked2);
EXPECT_CALL(event_engine, RunAfter(EventEngine::Duration(Duration::Hours(24)), EXPECT_CALL(event_engine, RunAfter(EventEngine::Duration(Duration::Hours(24)),
Matcher<absl::AnyInvocable<void()>>(_))) Matcher<absl::AnyInvocable<void()>>(_)))
.WillOnce([]() { .WillOnce([]() { return EventEngine::TaskHandle{123, 789}; });
return EventEngine::TaskHandle{123, 789};
});
auto id2 = callbacks.StartPing(bitgen); auto id2 = callbacks.StartPing(bitgen);
callbacks.OnPingTimeout(Duration::Hours(24), &event_engine, callbacks.OnPingTimeout(Duration::Hours(24), &event_engine,
[] { Crash("should not reach here"); }); [] { Crash("should not reach here"); });
@ -402,9 +390,7 @@ TEST(PingCallbacksTest, MultiPingRoundtripsWithOutOfOrderAcks) {
EXPECT_FALSE(acked2); EXPECT_FALSE(acked2);
EXPECT_CALL(event_engine, RunAfter(EventEngine::Duration(Duration::Hours(24)), EXPECT_CALL(event_engine, RunAfter(EventEngine::Duration(Duration::Hours(24)),
Matcher<absl::AnyInvocable<void()>>(_))) Matcher<absl::AnyInvocable<void()>>(_)))
.WillOnce([]() { .WillOnce([]() { return EventEngine::TaskHandle{123, 456}; });
return EventEngine::TaskHandle{123, 456};
});
auto id1 = callbacks.StartPing(bitgen); auto id1 = callbacks.StartPing(bitgen);
callbacks.OnPingTimeout(Duration::Hours(24), &event_engine, callbacks.OnPingTimeout(Duration::Hours(24), &event_engine,
[] { Crash("should not reach here"); }); [] { Crash("should not reach here"); });
@ -429,9 +415,7 @@ TEST(PingCallbacksTest, MultiPingRoundtripsWithOutOfOrderAcks) {
EXPECT_FALSE(acked2); EXPECT_FALSE(acked2);
EXPECT_CALL(event_engine, RunAfter(EventEngine::Duration(Duration::Hours(24)), EXPECT_CALL(event_engine, RunAfter(EventEngine::Duration(Duration::Hours(24)),
Matcher<absl::AnyInvocable<void()>>(_))) Matcher<absl::AnyInvocable<void()>>(_)))
.WillOnce([]() { .WillOnce([]() { return EventEngine::TaskHandle{123, 789}; });
return EventEngine::TaskHandle{123, 789};
});
auto id2 = callbacks.StartPing(bitgen); auto id2 = callbacks.StartPing(bitgen);
callbacks.OnPingTimeout(Duration::Hours(24), &event_engine, callbacks.OnPingTimeout(Duration::Hours(24), &event_engine,
[] { Crash("should not reach here"); }); [] { Crash("should not reach here"); });
@ -492,9 +476,7 @@ TEST(PingCallbacksTest, CoalescedPingsRoundtrip) {
EXPECT_FALSE(acked2); EXPECT_FALSE(acked2);
EXPECT_CALL(event_engine, RunAfter(EventEngine::Duration(Duration::Hours(24)), EXPECT_CALL(event_engine, RunAfter(EventEngine::Duration(Duration::Hours(24)),
Matcher<absl::AnyInvocable<void()>>(_))) Matcher<absl::AnyInvocable<void()>>(_)))
.WillOnce([]() { .WillOnce([]() { return EventEngine::TaskHandle{123, 456}; });
return EventEngine::TaskHandle{123, 456};
});
auto id = callbacks.StartPing(bitgen); auto id = callbacks.StartPing(bitgen);
callbacks.OnPingTimeout(Duration::Hours(24), &event_engine, callbacks.OnPingTimeout(Duration::Hours(24), &event_engine,
[] { Crash("should not reach here"); }); [] { Crash("should not reach here"); });
@ -537,9 +519,7 @@ TEST(PingCallbacksTest, CancelAllCancelsCallbacks) {
// Can still send a ping, no callback should be invoked // Can still send a ping, no callback should be invoked
EXPECT_CALL(event_engine, RunAfter(EventEngine::Duration(Duration::Hours(24)), EXPECT_CALL(event_engine, RunAfter(EventEngine::Duration(Duration::Hours(24)),
Matcher<absl::AnyInvocable<void()>>(_))) Matcher<absl::AnyInvocable<void()>>(_)))
.WillOnce([]() { .WillOnce([]() { return EventEngine::TaskHandle{123, 456}; });
return EventEngine::TaskHandle{123, 456};
});
auto id = callbacks.StartPing(bitgen); auto id = callbacks.StartPing(bitgen);
callbacks.OnPingTimeout(Duration::Hours(24), &event_engine, callbacks.OnPingTimeout(Duration::Hours(24), &event_engine,
[] { Crash("should not reach here"); }); [] { Crash("should not reach here"); });
@ -574,9 +554,7 @@ TEST(PingCallbacksTest, CancelAllCancelsInflightPings) {
EXPECT_FALSE(acked); EXPECT_FALSE(acked);
EXPECT_CALL(event_engine, RunAfter(EventEngine::Duration(Duration::Hours(24)), EXPECT_CALL(event_engine, RunAfter(EventEngine::Duration(Duration::Hours(24)),
Matcher<absl::AnyInvocable<void()>>(_))) Matcher<absl::AnyInvocable<void()>>(_)))
.WillOnce([]() { .WillOnce([]() { return EventEngine::TaskHandle{123, 456}; });
return EventEngine::TaskHandle{123, 456};
});
auto id = callbacks.StartPing(bitgen); auto id = callbacks.StartPing(bitgen);
callbacks.OnPingTimeout(Duration::Hours(24), &event_engine, callbacks.OnPingTimeout(Duration::Hours(24), &event_engine,
[] { Crash("should not reach here"); }); [] { Crash("should not reach here"); });

6
test/cpp/cocoapods/generic/generic.mm
Unescape View File

@ -146,10 +146,8 @@ int byte_buffer_eq_string(ByteBuffer* bb, const char* str) {
bool ignored_ok; bool ignored_ok;
cli_cq_.Shutdown(); cli_cq_.Shutdown();
srv_cq_->Shutdown(); srv_cq_->Shutdown();
while (cli_cq_.Next(&ignored_tag, &ignored_ok)) while (cli_cq_.Next(&ignored_tag, &ignored_ok));
; while (srv_cq_->Next(&ignored_tag, &ignored_ok));
while (srv_cq_->Next(&ignored_tag, &ignored_ok))
;
[super tearDown]; [super tearDown];
} }

2
test/cpp/qps/interarrival.h
Unescape View File

@ -87,7 +87,7 @@ class InterarrivalTimer {
thread_posns_.push_back(random_table_.begin() + (entries * i) / threads); thread_posns_.push_back(random_table_.begin() + (entries * i) / threads);
} }
} }
virtual ~InterarrivalTimer(){}; virtual ~InterarrivalTimer() {};
int64_t next(int thread_num) { int64_t next(int thread_num) {
auto ret = *(thread_posns_[thread_num]++); auto ret = *(thread_posns_[thread_num]++);

2
test/cpp/qps/server_async.cc
Unescape View File

@ -238,7 +238,7 @@ class AsyncQpsServerTest final : public grpc::testing::Server {
ServerRpcContext() {} ServerRpcContext() {}
void lock() { mu_.lock(); } void lock() { mu_.lock(); }
void unlock() { mu_.unlock(); } void unlock() { mu_.unlock(); }
virtual ~ServerRpcContext(){}; virtual ~ServerRpcContext() {};
virtual bool RunNextState(bool) = 0; // next state, return false if done virtual bool RunNextState(bool) = 0; // next state, return false if done
virtual void Reset() = 0; // start this back at a clean state virtual void Reset() = 0; // start this back at a clean state
private: private:

2
test/cpp/server/server_builder_with_socket_mutator_test.cc
Unescape View File

@ -84,7 +84,7 @@ class MockSocketMutatorServerBuilderOption : public grpc::ServerBuilderOption {
} }
void UpdatePlugins( void UpdatePlugins(
std::vector<std::unique_ptr<ServerBuilderPlugin>>*) override{}; std::vector<std::unique_ptr<ServerBuilderPlugin>>*) override {};
MockSocketMutator* mock_socket_mutator_; MockSocketMutator* mock_socket_mutator_;
}; };

2
tools/bazelify_tests/dockerimage_current_versions.bzl
Unescape View File

@ -113,5 +113,5 @@ DOCKERIMAGE_CURRENT_VERSIONS = {
"tools/dockerfile/test/rbe_ubuntu2004.current_version": "docker://us-docker.pkg.dev/grpc-testing/testing-images-public/rbe_ubuntu2004@sha256:b3eb1a17b7b091e3c5648a803076b2c40601242ff91c04d55997af6641305f68", "tools/dockerfile/test/rbe_ubuntu2004.current_version": "docker://us-docker.pkg.dev/grpc-testing/testing-images-public/rbe_ubuntu2004@sha256:b3eb1a17b7b091e3c5648a803076b2c40601242ff91c04d55997af6641305f68",
"tools/dockerfile/test/ruby_debian11_arm64.current_version": "docker://us-docker.pkg.dev/grpc-testing/testing-images-public/ruby_debian11_arm64@sha256:d2e79919b2e2d4cc36a29682ecb5170641df4fb506cfb453978ffdeb8a841bd9", "tools/dockerfile/test/ruby_debian11_arm64.current_version": "docker://us-docker.pkg.dev/grpc-testing/testing-images-public/ruby_debian11_arm64@sha256:d2e79919b2e2d4cc36a29682ecb5170641df4fb506cfb453978ffdeb8a841bd9",
"tools/dockerfile/test/ruby_debian11_x64.current_version": "docker://us-docker.pkg.dev/grpc-testing/testing-images-public/ruby_debian11_x64@sha256:6e8b4696ba0661f11a31ed0992a94d2efcd889a018f57160f0e2fb62963f3593", "tools/dockerfile/test/ruby_debian11_x64.current_version": "docker://us-docker.pkg.dev/grpc-testing/testing-images-public/ruby_debian11_x64@sha256:6e8b4696ba0661f11a31ed0992a94d2efcd889a018f57160f0e2fb62963f3593",
"tools/dockerfile/test/sanity.current_version": "docker://us-docker.pkg.dev/grpc-testing/testing-images-public/sanity@sha256:966aa97475368b6fc308a7e9e584ab471e8c6a47b4a6c9e709c0b1b7d4e2d800", "tools/dockerfile/test/sanity.current_version": "docker://us-docker.pkg.dev/grpc-testing/testing-images-public/sanity@sha256:4fb77e7130e10934e65ec0657e286a8ca5850e9a25441dabe2174b3cb6a56180",
} }

2
tools/dockerfile/grpc_clang_format/Dockerfile
Unescape View File

@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
FROM silkeh/clang:17-bookworm FROM silkeh/clang:18-bookworm
ADD clang_format_all_the_things.sh / ADD clang_format_all_the_things.sh /

2
tools/dockerfile/grpc_clang_tidy/Dockerfile
Unescape View File

@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
FROM silkeh/clang:17-bookworm FROM silkeh/clang:18-bookworm
# Install prerequisites for the clang-tidy script # Install prerequisites for the clang-tidy script
RUN apt-get update && apt-get install -y python3 jq git && apt-get clean RUN apt-get update && apt-get install -y python3 jq git && apt-get clean

2
tools/dockerfile/test/sanity.current_version
Unescape View File

@ -1 +1 @@
us-docker.pkg.dev/grpc-testing/testing-images-public/sanity:f21b7692698957bebcd72e8ab5d24c485cb4cbaf@sha256:966aa97475368b6fc308a7e9e584ab471e8c6a47b4a6c9e709c0b1b7d4e2d800 us-docker.pkg.dev/grpc-testing/testing-images-public/sanity:0006a2ed3aca736f842b3e1bf758cb6ab621922d@sha256:4fb77e7130e10934e65ec0657e286a8ca5850e9a25441dabe2174b3cb6a56180

10
tools/dockerfile/test/sanity/Dockerfile
Unescape View File

@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
FROM silkeh/clang:17-bookworm FROM silkeh/clang:18-bookworm
#================= #=================
# Basic C core dependencies # Basic C core dependencies
@ -67,13 +67,13 @@ RUN git config --global protocol.file.allow always
# (Bullseye comes with Python 3.9 which isn't supported by pytype yet) # (Bullseye comes with Python 3.9 which isn't supported by pytype yet)
RUN apt update && apt install -y build-essential zlib1g-dev libncurses5-dev libgdbm-dev \ RUN apt update && apt install -y build-essential zlib1g-dev libncurses5-dev libgdbm-dev \
libnss3-dev libssl-dev libreadline-dev libffi-dev libbz2-dev libnss3-dev libssl-dev libreadline-dev libffi-dev libbz2-dev
RUN curl -O https://www.python.org/ftp/python/3.7.9/Python-3.7.9.tar.xz && \ RUN curl -O https://www.python.org/ftp/python/3.7.17/Python-3.7.17.tar.xz && \
tar -xf Python-3.7.9.tar.xz && \ tar -xf Python-3.7.17.tar.xz && \
cd Python-3.7.9 && \ cd Python-3.7.17 && \
./configure && \ ./configure && \
make -j 4 && \ make -j 4 && \
make install make install
RUN curl https://bootstrap.pypa.io/get-pip.py | python3 RUN curl https://bootstrap.pypa.io/pip/3.7/get-pip.py | python3
# Google Cloud Platform API libraries # Google Cloud Platform API libraries
# These are needed for uploading test results to BigQuery (e.g. by tools/run_tests scripts) # These are needed for uploading test results to BigQuery (e.g. by tools/run_tests scripts)

Write Preview
Loading…
Cancel
Save