diff options
| author |  Noah Eisen <ncteisen@google.com> | 2016-10-12 15:04:45 -0700 |
|---|---|---|
| committer | Noah Eisen <ncteisen@google.com> | 2016-10-12 15:04:45 -0700 |
| commit | cece9c7368cab75444b3c34bb518a98d7f656759 (patch) | |
| tree | 27cf83a0d9244b678d479531f9d32630e0aef727 /test/cpp/interop/interop_client.h | |
| parent | 2cef11c6674e67aea8e7f63f7ac2869e5d44a7c5 (diff) | |
| parent | d44144c3b2112ed61a21c08331bfe9e18664ceb3 (diff) | |
manually fixed merge conflict. caused by the addition of a different new interop test
Diffstat (limited to 'test/cpp/interop/interop_client.h')
| -rw-r--r-- | test/cpp/interop/interop_client.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/test/cpp/interop/interop_client.h b/test/cpp/interop/interop_client.h index a535bf9a5a..0a96e7734d 100644 --- a/test/cpp/interop/interop_client.h +++ b/test/cpp/interop/interop_client.h @@ -80,6 +80,7 @@ class InteropClient { bool DoStatusWithMessage(); bool DoCustomMetadata(); bool DoUnimplementedMethod(); + bool DoCacheableUnary(); // Auth tests. // username is a string containing the user email bool DoJwtTokenCreds(const grpc::string& username); |