diff options
| author |  Vijay Pai <vpai@google.com> | 2016-10-18 12:15:08 -0700 |
|---|---|---|
| committer | Vijay Pai <vpai@google.com> | 2016-10-18 12:15:08 -0700 |
| commit | 9fa9315d62c3163a93eeae2b3d3bb70231567b83 (patch) | |
| tree | 49968018548e4a294026a9f95b8ea5363efceb0e /src/objective-c | |
| parent | 23c5b812687d0ebb86ed86d64416b232f8771e56 (diff) | |
| parent | 948f95b2ce4204f859c867207bd991d30ca17ee7 (diff) | |
Merge remote-tracking branch 'upstream/master' into fc_1dstream
Diffstat (limited to 'src/objective-c')
| -rw-r--r-- | src/objective-c/tests/InteropTests.m | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/src/objective-c/tests/InteropTests.m b/src/objective-c/tests/InteropTests.m index 44f22c9e85..9804734d6a 100644 --- a/src/objective-c/tests/InteropTests.m +++ b/src/objective-c/tests/InteropTests.m @@ -92,20 +92,21 @@ return 0; } ++ (void)setUp { +#ifdef GRPC_COMPILE_WITH_CRONET + // Cronet setup + [Cronet setHttp2Enabled:YES]; + [Cronet start]; + [GRPCCall useCronetWithEngine:[Cronet getGlobalEngine]]; +#endif +} + - (void)setUp { self.continueAfterFailure = NO; [GRPCCall resetHostSettings]; _service = self.class.host ? [RMTTestService serviceWithHost:self.class.host] : nil; -#ifdef GRPC_COMPILE_WITH_CRONET - if (cronetEngine == NULL) { - // Cronet setup - [Cronet setHttp2Enabled:YES]; - [Cronet start]; - [GRPCCall useCronetWithEngine:[Cronet getGlobalEngine]]; - } -#endif } - (void)testEmptyUnaryRPC { |