diff options
| author | Hadrien Zalek <hzalek@google.com> | 2020-07-24 12:30:10 -0700 |
|---|---|---|
| committer | Hadrien Zalek <hzalek@google.com> | 2020-07-24 23:35:41 +0000 |
| commit | 9b4675b8aba18f88cdb08004aac053ce16c4968a (patch) | |
| tree | 900389d86d6c0d165b93722f60de46164ecc6255 /testing | |
| parent | 332041b0592239d4bfe59bfd316f28c02f523570 (diff) | |
| parent | 57043233bf5aecce92f0c6629b6ac46d9393ce8c (diff) | |
| download | grpc-grpc-java-9b4675b8aba18f88cdb08004aac053ce16c4968a.tar.gz | |
Merge tag 'upstream/v1.16.1' into HEAD
Update the Java gRPC implementation source to that of a released version
(v1.16.1) instead of some intermediate commit after v1.15.0.
Test: m grpc-java
Bug: 148404241
Change-Id: I9c072aee054a4aecc1bdf39adf45e9a243b907f5
Diffstat (limited to 'testing')
| -rw-r--r-- | testing/src/main/java/io/grpc/internal/testing/AbstractTransportTest.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/testing/src/main/java/io/grpc/internal/testing/AbstractTransportTest.java b/testing/src/main/java/io/grpc/internal/testing/AbstractTransportTest.java index 2acbba932..19f5e1f68 100644 --- a/testing/src/main/java/io/grpc/internal/testing/AbstractTransportTest.java +++ b/testing/src/main/java/io/grpc/internal/testing/AbstractTransportTest.java @@ -44,7 +44,6 @@ import com.google.common.collect.Lists; import com.google.common.util.concurrent.MoreExecutors; import com.google.common.util.concurrent.SettableFuture; import io.grpc.Attributes; -import io.grpc.CallCredentials; import io.grpc.CallOptions; import io.grpc.ClientStreamTracer; import io.grpc.Grpc; @@ -59,6 +58,7 @@ import io.grpc.internal.ClientStream; import io.grpc.internal.ClientStreamListener; import io.grpc.internal.ClientTransport; import io.grpc.internal.ConnectionClientTransport; +import io.grpc.internal.GrpcAttributes; import io.grpc.internal.InternalServer; import io.grpc.internal.IoUtils; import io.grpc.internal.ManagedClientTransport; @@ -346,7 +346,7 @@ public abstract class AbstractTransportTest { verify(mockClientTransportListener, timeout(TIMEOUT_MS)).transportReady(); assertNotNull("security level should be set in client attributes", - connectionClient.getAttributes().get(CallCredentials.ATTR_SECURITY_LEVEL)); + connectionClient.getAttributes().get(GrpcAttributes.ATTR_SECURITY_LEVEL)); } @Test @@ -707,6 +707,7 @@ public abstract class AbstractTransportTest { assertEquals("additional attribute value", serverStream.getAttributes().get(ADDITIONAL_TRANSPORT_ATTR_KEY)); assertNotNull(serverStream.getAttributes().get(Grpc.TRANSPORT_ATTR_REMOTE_ADDR)); + assertNotNull(serverStream.getAttributes().get(Grpc.TRANSPORT_ATTR_LOCAL_ADDR)); serverStream.request(1); assertTrue(clientStreamListener.awaitOnReadyAndDrain(TIMEOUT_MS, TimeUnit.MILLISECONDS)); |