Skip to content

Commit 9534286

Browse files
committed
remove lingering else
1 parent 2e0fa5b commit 9534286

File tree

2 files changed

+0
-44
lines changed

2 files changed

+0
-44
lines changed

google/cloud/internal/grpc_opentelemetry_test.cc

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -319,20 +319,6 @@ TEST(OpenTelemetry, TracedAsyncBackoffPreservesContext) {
319319
SpanNamed("parent")));
320320
}
321321

322-
#else
323-
324-
TEST(NoOpenTelemetry, TracedAsyncBackoff) {
325-
auto const duration = std::chrono::nanoseconds(100);
326-
auto mock_cq = std::make_shared<testing_util::MockCompletionQueueImpl>();
327-
EXPECT_CALL(*mock_cq, MakeRelativeTimer(duration))
328-
.WillOnce(Return(ByMove(make_ready_future(
329-
make_status_or(std::chrono::system_clock::now())))));
330-
CompletionQueue cq(mock_cq);
331-
332-
auto f = TracedAsyncBackoff(cq, Options{}, duration, "Async Backoff");
333-
EXPECT_STATUS_OK(f.get());
334-
}
335-
336322
} // namespace
337323
} // namespace internal
338324
GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END

google/cloud/internal/tracing_rest_client_test.cc

Lines changed: 0 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -356,36 +356,6 @@ TEST(TracingRestClient, CachedConnection) {
356356
"gl-cpp.cached_connection", true)),
357357
SpanHasEvents(EventNamed("gl-cpp.curl.connected")))));
358358
}
359-
360-
#else
361-
362-
TEST(TracingRestClient, NoOpenTelemetry) {
363-
auto impl = std::make_unique<MockRestClient>();
364-
EXPECT_CALL(*impl, Delete).WillOnce([](RestContext&, RestRequest const&) {
365-
auto response = std::make_unique<MockRestResponse>();
366-
EXPECT_CALL(*response, StatusCode)
367-
.WillRepeatedly(Return(HttpStatusCode::kOk));
368-
EXPECT_CALL(*response, Headers).WillRepeatedly(Return(MockHeaders()));
369-
EXPECT_CALL(std::move(*response), ExtractPayload).WillOnce([] {
370-
return MakeMockHttpPayloadSuccess(MockContents());
371-
});
372-
return std::unique_ptr<RestResponse>(std::move(response));
373-
});
374-
375-
auto constexpr kUrl = "https://storage.googleapis.com/storage/v1/b/my-bucket";
376-
RestRequest request(kUrl);
377-
request.AddHeader("x-test-header-3", "value3");
378-
379-
auto client = MakeTracingRestClient(std::move(impl));
380-
rest_internal::RestContext context;
381-
auto r = client->Delete(context, request);
382-
ASSERT_STATUS_OK(r);
383-
auto response = *std::move(r);
384-
ASSERT_THAT(response, NotNull());
385-
EXPECT_THAT(response->StatusCode(), Eq(HttpStatusCode::kOk));
386-
EXPECT_THAT(response->Headers(), ElementsAreArray(MockHeaders()));
387-
auto contents = ReadAll(std::move(*response).ExtractPayload());
388-
EXPECT_THAT(contents, IsOkAndHolds(MockContents()));
389359
}
390360

391361
} // namespace

0 commit comments

Comments
 (0)