diff options
| author |  Craig Tiller <craig.tiller@gmail.com> | 2015-09-22 16:24:12 -0700 |
|---|---|---|
| committer | Craig Tiller <craig.tiller@gmail.com> | 2015-09-22 16:24:12 -0700 |
| commit | b0bd53a173be44f77fda30b0ed406a0882f24391 (patch) | |
| tree | 3c454570e00e54977901cac2cf9cea743f197cb2 /test/cpp/end2end | |
| parent | 4ed7a7585f14175137b39bc9b59ae4687ef35d0f (diff) | |
| parent | 41aab15c74130ae36850d88c8bea0063c83236e7 (diff) | |
Merge github.com:grpc/grpc into shindig
Conflicts:
src/core/surface/secure_channel_create.c
Diffstat (limited to 'test/cpp/end2end')
| -rw-r--r-- | test/cpp/end2end/end2end_test.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/test/cpp/end2end/end2end_test.cc b/test/cpp/end2end/end2end_test.cc index 7f047998c3..2659b0e213 100644 --- a/test/cpp/end2end/end2end_test.cc +++ b/test/cpp/end2end/end2end_test.cc @@ -121,7 +121,7 @@ class TestMetadataCredentialsPlugin : public MetadataCredentialsPlugin { bool IsBlocking() const GRPC_OVERRIDE { return is_blocking_; } Status GetMetadata(grpc::string_ref service_url, - std::multimap<grpc::string, grpc::string_ref>* metadata) + std::multimap<grpc::string, grpc::string>* metadata) GRPC_OVERRIDE { EXPECT_GT(service_url.length(), 0UL); EXPECT_TRUE(metadata != nullptr); @@ -175,9 +175,9 @@ class TestAuthMetadataProcessor : public AuthMetadataProcessor { if (auth_md_value == kGoodGuy) { context->AddProperty(kIdentityPropName, kGoodGuy); context->SetPeerIdentityPropertyName(kIdentityPropName); - consumed_auth_metadata->insert( - std::make_pair(string(auth_md->first.data(), auth_md->first.length()), - auth_md->second)); + consumed_auth_metadata->insert(std::make_pair( + string(auth_md->first.data(), auth_md->first.length()), + string(auth_md->second.data(), auth_md->second.length()))); return Status::OK; } else { return Status(StatusCode::UNAUTHENTICATED, |