|
|
@@ -18,7 +18,6 @@
|
|
|
|
|
|
#include "test/cpp/util/grpc_tool.h"
|
|
|
|
|
|
-#include <gflags/gflags.h>
|
|
|
#include <grpc/grpc.h>
|
|
|
#include <grpc/support/alloc.h>
|
|
|
#include <grpcpp/channel.h>
|
|
|
@@ -54,6 +53,8 @@ using grpc::testing::EchoResponse;
|
|
|
"Echo\n" \
|
|
|
"Echo1\n" \
|
|
|
"Echo2\n" \
|
|
|
+ "CheckDeadlineUpperBound\n" \
|
|
|
+ "CheckDeadlineSet\n" \
|
|
|
"CheckClientInitialMetadata\n" \
|
|
|
"RequestStream\n" \
|
|
|
"ResponseStream\n" \
|
|
|
@@ -70,6 +71,10 @@ using grpc::testing::EchoResponse;
|
|
|
"{}\n" \
|
|
|
" rpc Echo2(grpc.testing.EchoRequest) returns (grpc.testing.EchoResponse) " \
|
|
|
"{}\n" \
|
|
|
+ " rpc CheckDeadlineUpperBound(grpc.testing.SimpleRequest) returns " \
|
|
|
+ "(grpc.testing.StringValue) {}\n" \
|
|
|
+ " rpc CheckDeadlineSet(grpc.testing.SimpleRequest) returns " \
|
|
|
+ "(grpc.testing.StringValue) {}\n" \
|
|
|
" rpc CheckClientInitialMetadata(grpc.testing.SimpleRequest) returns " \
|
|
|
"(grpc.testing.SimpleResponse) {}\n" \
|
|
|
" rpc RequestStream(stream grpc.testing.EchoRequest) returns " \
|
|
|
@@ -109,17 +114,6 @@ DECLARE_string(ssl_target);
|
|
|
namespace grpc {
|
|
|
namespace testing {
|
|
|
|
|
|
-DECLARE_bool(binary_input);
|
|
|
-DECLARE_bool(binary_output);
|
|
|
-DECLARE_bool(json_input);
|
|
|
-DECLARE_bool(json_output);
|
|
|
-DECLARE_bool(l);
|
|
|
-DECLARE_bool(batch);
|
|
|
-DECLARE_string(metadata);
|
|
|
-DECLARE_string(protofiles);
|
|
|
-DECLARE_string(proto_path);
|
|
|
-DECLARE_string(default_service_config);
|
|
|
-
|
|
|
namespace {
|
|
|
|
|
|
const int kServerDefaultResponseStreamsToSend = 3;
|
|
|
@@ -177,6 +171,30 @@ class TestServiceImpl : public ::grpc::testing::EchoTestService::Service {
|
|
|
return Status::OK;
|
|
|
}
|
|
|
|
|
|
+ Status CheckDeadlineSet(ServerContext* context, const SimpleRequest* request,
|
|
|
+ StringValue* response) override {
|
|
|
+ response->set_message(context->deadline() !=
|
|
|
+ std::chrono::system_clock::time_point::max()
|
|
|
+ ? "true"
|
|
|
+ : "false");
|
|
|
+ return Status::OK;
|
|
|
+ }
|
|
|
+
|
|
|
+ // Check if deadline - current time <= timeout
|
|
|
+ // If deadline set, timeout + current time should be an upper bound for it
|
|
|
+ Status CheckDeadlineUpperBound(ServerContext* context,
|
|
|
+ const SimpleRequest* request,
|
|
|
+ StringValue* response) override {
|
|
|
+ auto seconds = std::chrono::duration_cast<std::chrono::seconds>(
|
|
|
+ context->deadline() - std::chrono::system_clock::now());
|
|
|
+
|
|
|
+ // Returning string instead of bool to avoid using embedded messages in
|
|
|
+ // proto3
|
|
|
+ response->set_message(seconds.count() <= FLAGS_timeout ? "true"
|
|
|
+ : "false");
|
|
|
+ return Status::OK;
|
|
|
+ }
|
|
|
+
|
|
|
Status RequestStream(ServerContext* context,
|
|
|
ServerReader<EchoRequest>* reader,
|
|
|
EchoResponse* response) override {
|
|
|
@@ -862,6 +880,93 @@ TEST_F(GrpcToolTest, CallCommandRequestStreamWithBadRequestJsonInput) {
|
|
|
ShutdownServer();
|
|
|
}
|
|
|
|
|
|
+TEST_F(GrpcToolTest, CallCommandWithTimeoutDeadlineSet) {
|
|
|
+ // Test input "grpc_cli call CheckDeadlineSet --timeout=5000.25"
|
|
|
+ std::stringstream output_stream;
|
|
|
+
|
|
|
+ const std::string server_address = SetUpServer();
|
|
|
+ const char* argv[] = {"grpc_cli", "call", server_address.c_str(),
|
|
|
+ "CheckDeadlineSet"};
|
|
|
+
|
|
|
+ // Set timeout to 5000.25 seconds
|
|
|
+ FLAGS_timeout = 5000.25;
|
|
|
+
|
|
|
+ EXPECT_TRUE(0 == GrpcToolMainLib(ArraySize(argv), argv, TestCliCredentials(),
|
|
|
+ std::bind(PrintStream, &output_stream,
|
|
|
+ std::placeholders::_1)));
|
|
|
+
|
|
|
+ // Expected output: "message: "true"", deadline set
|
|
|
+ EXPECT_TRUE(nullptr !=
|
|
|
+ strstr(output_stream.str().c_str(), "message: \"true\""));
|
|
|
+ ShutdownServer();
|
|
|
+}
|
|
|
+
|
|
|
+TEST_F(GrpcToolTest, CallCommandWithTimeoutDeadlineUpperBound) {
|
|
|
+ // Test input "grpc_cli call CheckDeadlineUpperBound --timeout=900"
|
|
|
+ std::stringstream output_stream;
|
|
|
+
|
|
|
+ const std::string server_address = SetUpServer();
|
|
|
+ const char* argv[] = {"grpc_cli", "call", server_address.c_str(),
|
|
|
+ "CheckDeadlineUpperBound"};
|
|
|
+
|
|
|
+ // Set timeout to 900 seconds
|
|
|
+ FLAGS_timeout = 900;
|
|
|
+
|
|
|
+ EXPECT_TRUE(0 == GrpcToolMainLib(ArraySize(argv), argv, TestCliCredentials(),
|
|
|
+ std::bind(PrintStream, &output_stream,
|
|
|
+ std::placeholders::_1)));
|
|
|
+
|
|
|
+ // Expected output: "message: "true""
|
|
|
+ // deadline not greater than timeout + current time
|
|
|
+ EXPECT_TRUE(nullptr !=
|
|
|
+ strstr(output_stream.str().c_str(), "message: \"true\""));
|
|
|
+ ShutdownServer();
|
|
|
+}
|
|
|
+
|
|
|
+TEST_F(GrpcToolTest, CallCommandWithNegativeTimeoutValue) {
|
|
|
+ // Test input "grpc_cli call CheckDeadlineSet --timeout=-5"
|
|
|
+ std::stringstream output_stream;
|
|
|
+
|
|
|
+ const std::string server_address = SetUpServer();
|
|
|
+ const char* argv[] = {"grpc_cli", "call", server_address.c_str(),
|
|
|
+ "CheckDeadlineSet"};
|
|
|
+
|
|
|
+ // Set timeout to -5 (deadline not set)
|
|
|
+ FLAGS_timeout = -5;
|
|
|
+
|
|
|
+ EXPECT_TRUE(0 == GrpcToolMainLib(ArraySize(argv), argv, TestCliCredentials(),
|
|
|
+ std::bind(PrintStream, &output_stream,
|
|
|
+ std::placeholders::_1)));
|
|
|
+
|
|
|
+ // Expected output: "message: "false"", deadline not set
|
|
|
+ EXPECT_TRUE(nullptr !=
|
|
|
+ strstr(output_stream.str().c_str(), "message: \"false\""));
|
|
|
+
|
|
|
+ ShutdownServer();
|
|
|
+}
|
|
|
+
|
|
|
+TEST_F(GrpcToolTest, CallCommandWithDefaultTimeoutValue) {
|
|
|
+ // Test input "grpc_cli call CheckDeadlineSet --timeout=-1"
|
|
|
+ std::stringstream output_stream;
|
|
|
+
|
|
|
+ const std::string server_address = SetUpServer();
|
|
|
+ const char* argv[] = {"grpc_cli", "call", server_address.c_str(),
|
|
|
+ "CheckDeadlineSet"};
|
|
|
+
|
|
|
+ // Set timeout to -1 (default value, deadline not set)
|
|
|
+ FLAGS_timeout = -1;
|
|
|
+
|
|
|
+ EXPECT_TRUE(0 == GrpcToolMainLib(ArraySize(argv), argv, TestCliCredentials(),
|
|
|
+ std::bind(PrintStream, &output_stream,
|
|
|
+ std::placeholders::_1)));
|
|
|
+
|
|
|
+ // Expected output: "message: "false"", deadline not set
|
|
|
+ EXPECT_TRUE(nullptr !=
|
|
|
+ strstr(output_stream.str().c_str(), "message: \"false\""));
|
|
|
+
|
|
|
+ ShutdownServer();
|
|
|
+}
|
|
|
+
|
|
|
TEST_F(GrpcToolTest, CallCommandResponseStream) {
|
|
|
// Test input: grpc_cli call localhost:<port> ResponseStream "message:
|
|
|
// 'Hello'"
|
Alisha Nanda