Partial revert of "Fix wrong exit status (linkedin#338)"

MobileNativeFoundation · Sep 26, 2019 · 2fc30a2 · 2fc30a2
1 parent 27e247f
commit 2fc30a2
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/bp/src/Bluepill.m b/bp/src/Bluepill.m
@@ -604,7 +604,9 @@ - (void)finishWithContext:(BPExecutionContext *)context {
     if (![self hasRemainingTestsInContext:context] && (context.attemptNumber <= [context.config.errorRetriesCount integerValue])) {
         [BPUtils printInfo:INFO withString:@"No more tests to run."];
         [BPUtils printInfo:INFO withString:@"%s:%d finalExitStatus = %@", __FILE__, __LINE__, [BPExitStatusHelper stringFromExitStatus:self.finalExitStatus]];
-        self.finalExitStatus = context.exitStatus;
+        // TODO: Temporarily disabling the fix from PR#338 while the issue is being investigated
+        // self.finalExitStatus = context.exitStatus;
+        self.finalExitStatus = context.finalExitStatus | context.exitStatus;
         self.exitLoop = YES;
         return;
     }

diff --git a/bp/tests/BluepillTests.m b/bp/tests/BluepillTests.m
@@ -232,7 +232,8 @@ - (void)testReportWithAppCrashingAndRetryOnlyFailedTestsSet {
     [self assertGotReport:junitReportPath isEqualToWantReport:expectedFilePath];
 }
 
-- (void)testAppCrashingAndRetryReportsCorrectExitCode {
+// TODO: Enable this while re-enabling the fix from PR#338
+- (void)DISABLE_testAppCrashingAndRetryReportsCorrectExitCode {
     NSString *testBundlePath = [BPTestHelper sampleAppCrashingTestsBundlePath];
     self.config.testBundlePath = testBundlePath;
     NSString *tempDir = NSTemporaryDirectory();
@@ -416,7 +417,7 @@ - (void)testKeepSimulatorWithAppCrashingTestsSet  {
 }
 
 //simulator shouldn't be kept in this case
-- (void)testKeepSimulatorWithAppHaningTestsSet  {
+- (void)testKeepSimulatorWithAppHangingTestsSet  {
     NSString *testBundlePath = [BPTestHelper sampleAppHangingTestsBundlePath];
     self.config.testBundlePath = testBundlePath;
     self.config.keepSimulator = YES;