diff options
| author |  Sree Kuchibhotla <sreek@google.com> | 2016-10-17 14:15:50 -0700 |
|---|---|---|
| committer | Sree Kuchibhotla <sreek@google.com> | 2016-10-17 14:15:50 -0700 |
| commit | 34ad82d6f683b06ecb3844769ef53784d8cba30b (patch) | |
| tree | 27551d64348144de399c7f874adfedbf919458d3 /src/objective-c/tests/InteropTests.m | |
| parent | 923d641c27f0ebcceb67a28fd17168ac34e7bf5e (diff) | |
| parent | 872559593329f1a6903d0b41f669eb4ba719dbe8 (diff) | |
Merge branch 'master' into new_scenario
Diffstat (limited to 'src/objective-c/tests/InteropTests.m')
| -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 { |