Create apps on demand rather than at the start of each test

noxchen · Nov 13, 2020 · 1113a24 · 1113a24
1 parent 8641deb
commit 1113a24
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 15 deletions.
diff --git a/Realm/ObjectServerTests/RLMSyncTestCase.h b/Realm/ObjectServerTests/RLMSyncTestCase.h
@@ -147,7 +147,6 @@ NS_ASSUME_NONNULL_BEGIN
 /// Manually set the refresh token for a user. Used for testing invalid token conditions.
 - (void)manuallySetRefreshTokenForUser:(RLMUser *)user value:(NSString *)tokenValue;
 
-- (void)setupSyncManager;
 - (void)resetSyncManager;
 
 - (NSString *)badAccessToken;

diff --git a/Realm/ObjectServerTests/RLMSyncTestCase.mm b/Realm/ObjectServerTests/RLMSyncTestCase.mm
@@ -183,7 +183,10 @@ - (void)sendRequestToServer:(RLMRequest *)request completion:(RLMNetworkTranspor
 
 #pragma mark RLMSyncTestCase
 
-@implementation RLMSyncTestCase
+@implementation RLMSyncTestCase {
+    NSString *_appId;
+    RLMApp *_app;
+}
 
 #pragma mark - Helper methods
 
@@ -435,8 +438,9 @@ - (void)manuallySetRefreshTokenForUser:(RLMUser *)user value:(NSString *)tokenVa
 - (void)setUp {
     [super setUp];
     self.continueAfterFailure = NO;
-
-    [self setupSyncManager];
+    if (auto ids = NSProcessInfo.processInfo.environment[@"RLMParentAppIds"]) {
+        _appIds = [ids componentsSeparatedByString:@","];   //take the one array for split the string
+    }
 }
 
 - (void)tearDown {
@@ -451,9 +455,6 @@ - (void)setupSyncManager {
         NSLog(@"Failed to create app: %@", error);
         abort();
     }
-    if (auto ids = NSProcessInfo.processInfo.environment[@"RLMParentAppIds"]) {
-        _appIds = [ids componentsSeparatedByString:@","];   //take the one array for split the string
-    }
 
     if (self.isParent) {
         [NSFileManager.defaultManager removeItemAtURL:[self clientDataRoot] error:&error];
@@ -467,8 +468,22 @@ - (void)setupSyncManager {
     syncManager.userAgent = self.name;
 }
 
+- (NSString *)appId {
+    if (!_appId) {
+        [self setupSyncManager];
+    }
+    return _appId;
+}
+
+- (RLMApp *)app {
+    if (!_app) {
+        [self setupSyncManager];
+    }
+    return _app;
+}
+
 - (void)resetSyncManager {
-    if (!self.appId) {
+    if (!_appId) {
         return;
     }
 
@@ -530,4 +545,8 @@ - (NSURL *)clientDataRoot {
     return clientDataRoot;
 }
 
+- (NSTask *)childTask {
+    return [self childTaskWithAppIds:_appId ? @[_appId] : @[]];
+}
+
 @end
diff --git a/Realm/TestUtils/RLMMultiProcessTestCase.m b/Realm/TestUtils/RLMMultiProcessTestCase.m
@@ -116,11 +116,8 @@ - (NSTask *)childTaskWithAppIds:(NSArray *)appIds {
     NSMutableDictionary *env = [NSProcessInfo.processInfo.environment mutableCopy];
     env[@"RLMProcessIsChild"] = @"true";
     env[@"RLMParentProcessBundleID"] = [NSBundle mainBundle].bundleIdentifier;
-    if ([self respondsToSelector:@selector(appId)]) {
-        env[@"RLMParentAppId"] = self.appId;
-    }
-
     if (appIds.count) {
+        env[@"RLMParentAppId"] = appIds[0];
         env[@"RLMParentAppIds"] = [appIds componentsJoinedByString:@","];
     }
 
@@ -152,7 +149,7 @@ - (NSTask *)childTask {
     return [self childTaskWithAppIds:@[]];
 }
 
-- (int)runChildAndWaitWithAppIds:(NSArray *)appIds {
+- (NSPipe *)filterPipe {
     NSPipe *pipe = [NSPipe pipe];
     NSMutableData *buffer = [[NSMutableData alloc] init];
 
@@ -173,16 +170,23 @@ - (int)runChildAndWaitWithAppIds:(NSArray *)appIds {
         // Remove everything up to the last newline, leaving any data not newline-terminated in the buffer
         [buffer replaceBytesInRange:NSMakeRange(0, start - (char *)buffer.bytes) withBytes:0 length:0];
     };
+    return pipe;
+}
 
+- (int)runChildAndWaitWithAppIds:(NSArray *)appIds {
     NSTask *task = [self childTaskWithAppIds:appIds];
-    task.standardError = pipe;
+    task.standardError = self.filterPipe;
     [task launch];
     [task waitUntilExit];
     return task.terminationStatus;
 }
 
 - (int)runChildAndWait {
-    return [self runChildAndWaitWithAppIds:@[]];
+    NSTask *task = [self childTask];
+    task.standardError = self.filterPipe;
+    [task launch];
+    [task waitUntilExit];
+    return task.terminationStatus;
 }
 
 #else