diff options
| author |  Nicolas Noble <nicolasnoble@users.noreply.github.com> | 2017-11-29 15:57:25 -0800 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2017-11-29 15:57:25 -0800 |
| commit | 17a1431a37108bb55c24a2022c1db9ea9632dcc9 (patch) | |
| tree | dec167fe1970014a37ffa41c218b833290977a74 /src/csharp/tests.json | |
| parent | c49b24a7c03a262e242b18066f252415cd4afc8a (diff) | |
| parent | fcc796c699961e3ffa5b2c3aa9b2bdf1f189500a (diff) | |
Merge pull request #13466 from nicolasnoble/upmerge-from-v1.7
Upmerge from v1.7
Diffstat (limited to 'src/csharp/tests.json')
| -rw-r--r-- | src/csharp/tests.json | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/csharp/tests.json b/src/csharp/tests.json index 7841051052..65a0ed293f 100644 --- a/src/csharp/tests.json +++ b/src/csharp/tests.json @@ -10,6 +10,7 @@ "Grpc.Core.Tests.AppDomainUnloadTest", "Grpc.Core.Tests.AuthContextTest", "Grpc.Core.Tests.AuthPropertyTest", + "Grpc.Core.Tests.CallCancellationTest", "Grpc.Core.Tests.CallCredentialsTest", "Grpc.Core.Tests.CallOptionsTest", "Grpc.Core.Tests.ChannelCredentialsTest", |