Merge pull request #107 from linkedin/fix_infinite_retry

Fix If there is an error launching the app and tests, new simulators …

Author: Keqiu Hu

Bluepill-cli/Bluepill-cli/Bluepill/Bluepill.m

@@ -197,7 +197,11 @@ - (void)setupExecutionWithContext:(BPExecutionContext *)context {
 
     context.runner = [self createSimulatorRunnerWithContext:context];
 
+    // Set up retry counts.
     self.maxCreateTries = [self.config.maxCreateTries integerValue];
+    self.maxInstallTries = [self.config.maxInstallTries integerValue];
+    self.maxLaunchTries = [self.config.maxLaunchTries integerValue];
+
     NEXT([self createSimulatorWithContext:context]);
 }
 
@@ -249,7 +253,6 @@ - (void)createSimulatorWithContext:(BPExecutionContext *)context {
         [BPUtils printInfo:ERROR withString:[@"Timeout: " stringByAppendingString:stepName]];
     };
 
-    self.maxInstallTries = [self.config.maxInstallTries integerValue];
     [context.runner createSimulatorWithDeviceName:deviceName completion:handler.defaultHandlerBlock];
 }
 
@@ -258,8 +261,6 @@ - (void)installApplicationWithContext:(BPExecutionContext *)context {
     [[BPStats sharedStats] startTimer:stepName];
     [BPUtils printInfo:INFO withString:stepName];
 
-    self.maxLaunchTries = [self.config.maxLaunchTries integerValue];
-
     NSError *error = nil;
     BOOL success = [context.runner installApplicationAndReturnError:&error];