Fix test timeout hang (#247)

We've seen cases where if a test times out, the `bp` process will hang waiting for the `BP_APP_PROC_ENDED` marker, which never gets put into the input. This fixes it by avoiding the marker entirely and just notifying the Simulator Monitor directly.
MobileNativeFoundation · Feb 22, 2018 · 0aab054 · 0aab054
1 parent c666708
commit 0aab054
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 3 deletions.
diff --git a/Bluepill-cli/Bluepill-cli/Bluepill/Reporters/BPExecutionPhaseProtocol.h b/Bluepill-cli/Bluepill-cli/Bluepill/Reporters/BPExecutionPhaseProtocol.h
@@ -32,6 +32,8 @@
 
 - (void)onOutputReceived:(NSString *)output;
 
+- (void)setParserStateCompleted;
+
 @end
 
 @protocol BPMonitorCallbackProtocol <NSObject>

diff --git a/Bluepill-cli/Bluepill-cli/Bluepill/Reporters/BPTreeParser.h b/Bluepill-cli/Bluepill-cli/Bluepill/Reporters/BPTreeParser.h
@@ -58,5 +58,6 @@
 - (void)completedFinalRun;
 - (void)cleanup;
 - (nullable NSString *)generateLog:(nonnull id<BPReporter>)reporter;
+- (void)setParserStateCompleted;
 
 @end
diff --git a/Bluepill-cli/Bluepill-cli/Simulator/BPSimulator.h b/Bluepill-cli/Bluepill-cli/Simulator/BPSimulator.h
@@ -29,6 +29,8 @@
 
 - (void)createSimulatorWithDeviceName:(NSString *)deviceName completion:(void (^)(NSError *))completion;
 
+- (void)setParserStateCompleted;
+
 - (BOOL)useSimulatorWithDeviceUDID:(NSUUID *)deviceUDID;
 
 - (BOOL)uninstallApplicationAndReturnError:(NSError **)error;

diff --git a/Bluepill-cli/Bluepill-cli/Simulator/BPSimulator.m b/Bluepill-cli/Bluepill-cli/Simulator/BPSimulator.m
@@ -358,6 +358,7 @@ - (void)launchApplicationAndExecuteTestsWithParser:(BPTreeParser *)parser andCom
             });
             dispatch_source_set_cancel_handler(source, ^{
                 blockSelf.monitor.appState = Completed;
+                [parser.delegate setParserStateCompleted];
                 // Post a APPCLOSED signal to the fifo
                 [blockSelf.stdOutHandle writeData:[@"\nBP_APP_PROC_ENDED\n" dataUsingEncoding:NSUTF8StringEncoding]];
             });
@@ -470,4 +471,7 @@ - (NSDictionary *)appInfo:(NSString *)bundleID error:(NSError **)error {
     return appInfo;
 }
 
+- (void)setParserStateCompleted {
+}
+
 @end
diff --git a/Bluepill-cli/Bluepill-cli/Simulator/SimulatorMonitor.m b/Bluepill-cli/Bluepill-cli/Simulator/SimulatorMonitor.m
@@ -191,7 +191,6 @@ - (void)onTestSuiteEnded:(NSString *)testSuiteName
 - (void)onOutputReceived:(NSString *)output {
     NSDate *currentTime = [NSDate date];
 
-    assert(self.parserState != Completed);
     if (self.parserState == Idle) {
         self.parserState = Running;
     }
@@ -286,4 +285,8 @@ - (void)saveScreenshotForFailedTestWithName:(NSString *)testName inClass:(NSStri
     [self.screenshotService saveScreenshotForFailedTestWithName:fullTestName];
 }
 
+- (void)setParserStateCompleted {
+    self.parserState = Completed;
+}
+
 @end
diff --git a/circle.yml b/circle.yml
@@ -8,5 +8,4 @@ compile:
 
 test:
   override:
-    - ./scripts/bluepill.sh test
-
+    - ./scripts/bluepill.sh test
-Original file line number
+Diff line change
@@ Expand Up / @@ -32,6 +32,8 @@ @@
     - (void)onOutputReceived:(NSString *)output;
+    - (void)setParserStateCompleted;
     @end
     @protocol BPMonitorCallbackProtocol <NSObject>
@@ Expand Down @@