aboutsummaryrefslogtreecommitdiffhomepage
path: root/test/cpp/interop
diff options
context:
space:
mode:
authorGravatar Nicolas "Pixel" Noble <pixel@nobis-crew.org>2015-02-06 20:45:54 +0100
committerGravatar Nicolas "Pixel" Noble <pixel@nobis-crew.org>2015-02-06 20:45:54 +0100
commit3f36f5e316bd8686e8f6050baf1168078a34bb86 (patch)
tree0a7c722625bd09dc82594221a5ace04caf651b50 /test/cpp/interop
parent15867f197b55d489677ec0dfdba9bd1d9246eceb (diff)
Few minor fixes.
Fixing a few issues in case you *cough* have a different local implementation of protobuf, gtest and gflags for some weird reason.
Diffstat (limited to 'test/cpp/interop')
-rw-r--r--test/cpp/interop/client.cc10
1 files changed, 5 insertions, 5 deletions
diff --git a/test/cpp/interop/client.cc b/test/cpp/interop/client.cc
index a0662fd05f..0fa76f0e02 100644
--- a/test/cpp/interop/client.cc
+++ b/test/cpp/interop/client.cc
@@ -191,10 +191,10 @@ void DoComputeEngineCreds() {
gpr_log(GPR_INFO, "Got username %s", response.username().c_str());
gpr_log(GPR_INFO, "Got oauth_scope %s", response.oauth_scope().c_str());
GPR_ASSERT(!response.username().empty());
- GPR_ASSERT(response.username() == FLAGS_default_service_account);
+ GPR_ASSERT(response.username().c_str() == FLAGS_default_service_account);
GPR_ASSERT(!response.oauth_scope().empty());
- GPR_ASSERT(
- FLAGS_oauth_scope.find(response.oauth_scope()) != grpc::string::npos);
+ const char *oauth_scope_str = response.oauth_scope().c_str();
+ GPR_ASSERT(FLAGS_oauth_scope.find(oauth_scope_str) != grpc::string::npos);
gpr_log(GPR_INFO, "Large unary with compute engine creds done.");
}
@@ -212,8 +212,8 @@ void DoServiceAccountCreds() {
GPR_ASSERT(!response.oauth_scope().empty());
grpc::string json_key = GetServiceAccountJsonKey();
GPR_ASSERT(json_key.find(response.username()) != grpc::string::npos);
- GPR_ASSERT(FLAGS_oauth_scope.find(response.oauth_scope()) !=
- grpc::string::npos);
+ const char *oauth_scope_str = response.oauth_scope().c_str();
+ GPR_ASSERT(FLAGS_oauth_scope.find(oauth_scope_str) != grpc::string::npos);
gpr_log(GPR_INFO, "Large unary with service account creds done.");
}