From f68e99645ba81fd0a93352696ef405238cb7ce5b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oliv=C3=A9r=20Falvai?= <oliver.falvai@bitrise.io>
Date: Thu, 30 Jul 2026 13:18:12 +0200
Subject: [PATCH] Fail loudly when preparing the emulator for a test fails

The beforeEach hook in testBuilder swallowed every error from prepareEmulatorForTest, so an emulator in a bad state surfaced later as an unrelated assertion failure somewhere else in the scenario. It now logs and rethrows.

Rethrowing on its own would have broken every scenario, because iOS "simctl terminate" exits non-zero when the app is not running, and the app is not running before the first test of a scenario. Verified on Xcode 26.6 / iOS 26.5: terminate reports "found nothing to terminate" identically whether the app was never installed or is merely idle, so the error text and the exit code cannot tell a missing app apart from a broken simulator. simctl appinfo, get_app_container and listapps do not help either, as they only report whether the app is installed, and their output is unchanged by the app running or not.

So IOSEmulatorManager.endRunningApplication now establishes the running state up front with "simctl spawn booted launchctl list", where a running app appears as UIKitApplication:<bundle id> with a live pid, and skips terminate when the app is not running. Everything else propagates.

Android needs no equivalent guard: "am force-stop" exits 0 whether or not the app is installed or running (verified against an emulator), and "pm clear" is already guarded by an existence check. Adding one there would only add an adb round-trip per test.

Verified end to end against a live simulator and emulator for the installed-but-idle, never-installed and actually-running cases.

Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
---
 .../script/platform.js                        | 21 +++++++++++++++++--
 .../script/testBuilder.js                     |  5 ++++-
 2 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/code-push-plugin-testing-framework/script/platform.js b/code-push-plugin-testing-framework/script/platform.js
index 56bd16a..195b13f 100644
--- a/code-push-plugin-testing-framework/script/platform.js
+++ b/code-push-plugin-testing-framework/script/platform.js
@@ -409,8 +409,13 @@ var IOSEmulatorManager = (function () {
     /**
      * Ends a running application given its app id.
      */
-    IOSEmulatorManager.prototype.endRunningApplication = function (appId) {
-        return testUtil_1.TestUtil.getProcessOutput("xcrun simctl terminate booted " + appId, undefined).then(function () { return null; })
+    IOSEmulatorManager.prototype.endRunningApplication = async function (appId) {
+        const isAppRunning = await isAppRunningOnIOS(appId);
+        if (!isAppRunning) {
+            return null;
+        }
+        await testUtil_1.TestUtil.getProcessOutput("xcrun simctl terminate booted " + appId, undefined);
+        return null;
     };
     /**
      * Restarts an already installed application by app id.
@@ -461,6 +466,18 @@ var IOSEmulatorManager = (function () {
 }());
 exports.IOSEmulatorManager = IOSEmulatorManager;
 
+/**
+ * Returns whether the app is currently running on the booted simulator.
+ *
+ * "xcrun simctl terminate" fails when the app is not running, and it reports that the same way it reports
+ * a genuinely broken simulator, so the running state has to be established up front instead. Running apps
+ * appear in launchctl's job list as "UIKitApplication:<bundle id>[...]" with a live pid.
+ */
+async function isAppRunningOnIOS(appId) {
+    const output = await testUtil_1.TestUtil.getProcessOutput("xcrun simctl spawn booted launchctl list", { noLogCommand: true, noLogStdOut: true, noLogStdErr: true });
+    return output.includes(appId);
+}
+
 function commandWithCheckAppExistence(command, appId) {
     return testUtil_1.TestUtil.getProcessOutput("adb shell pm list packages", { noLogCommand: true, noLogStdOut: true, noLogStdErr: true })
         .then((output) => {
diff --git a/code-push-plugin-testing-framework/script/testBuilder.js b/code-push-plugin-testing-framework/script/testBuilder.js
index 89c1458..286be44 100644
--- a/code-push-plugin-testing-framework/script/testBuilder.js
+++ b/code-push-plugin-testing-framework/script/testBuilder.js
@@ -35,7 +35,10 @@ function describeInternal(func, description, spec, scenarioPath) {
         });
         beforeEach(function () {
             return TestContext.targetPlatform.getEmulatorManager().prepareEmulatorForTest(TestConfig.TestNamespace)
-                .catch(function () { });
+                .catch(function (error) {
+                    console.error("Failed to prepare emulator/simulator for the test.");
+                    throw error;
+                });
         });
         if (scenarioPath) {
             before(function () {