aboutsummaryrefslogtreecommitdiffhomepage
path: root/src
diff options
context:
space:
mode:
authorGravatar Muxi Yan <muxi@users.noreply.github.com>2016-10-13 17:25:22 -0700
committerGravatar GitHub <noreply@github.com>2016-10-13 17:25:22 -0700
commit2f27a16a6bfaea7c81024ad8ee377ff61216c520 (patch)
tree1be3141cd758a8ee826a4fd98a55a32b8eae1c08 /src
parent448a16dd2886c84295d3ffc8aae2ccbecb462d38 (diff)
parentbe4fcc47c556104122674ff6272626e8843cbc71 (diff)
Merge pull request #8369 from muxi/fix-interoptest
Fix InteropTests.m bug
Diffstat (limited to 'src')
-rw-r--r--src/objective-c/tests/InteropTests.m17
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 {