@ohos-ports/floss 5.0.1-beta.6 → 5.0.1-beta.8

package/lib/browser-runner.js

@@ -68,6 +68,71 @@ function execOhosBm(args, timeout) {
     return execCmd(OHOS_BM_PATH, args, timeout);
 }
 
+// ─── Browser process cleanup ─────────────────────────────────────────
+
+var killedPids = new Set();
+
+function getBrowserPids() {
+    try {
+        var { execFileSync } = require("child_process");
+        var output = execFileSync("ps", ["-A", "-o", "pid,name"], {
+            timeout: 5000,
+            encoding: "utf-8",
+        }).trim();
+        var pids = [];
+        var lines = output.split("\n");
+        for (var i = 0; i < lines.length; i++) {
+            var line = lines[i].trim();
+            if (line.indexOf("htbrowser") !== -1 || line.indexOf(BROWSER_PKG) !== -1) {
+                var parts = line.split(/\s+/);
+                var pid = parseInt(parts[0], 10);
+                if (!isNaN(pid) && pid > 0) {
+                    pids.push(pid);
+                }
+            }
+        }
+        return pids;
+    } catch (e) {
+        return [];
+    }
+}
+
+function isProcessAlive(pid) {
+    try {
+        process.kill(pid, 0);
+        return true;
+    } catch (e) {
+        return false;
+    }
+}
+
+async function forceKillBrowserProcesses() {
+    for (var attempt = 0; attempt < 3; attempt++) {
+        var pids = getBrowserPids();
+        if (pids.length === 0) break;
+
+        var anyKilled = false;
+        for (var i = 0; i < pids.length; i++) {
+            var pid = pids[i];
+            if (killedPids.has(pid)) continue;
+            if (isProcessAlive(pid)) {
+                try {
+                    process.kill(pid, "SIGKILL");
+                    killedPids.add(pid);
+                    anyKilled = true;
+                } catch (e) {
+                    killedPids.add(pid);
+                }
+            } else {
+                killedPids.add(pid);
+            }
+        }
+
+        if (!anyKilled) break;
+        await sleep(500);
+    }
+}
+
 // ─── Browser launch / close ───────────────────────────────────────────
 
 function buildLaunchArgs() {
@@ -99,6 +164,8 @@ async function launchBrowser() {
     // 2. Kill existing browser process
     try { execOhosAa(["force-stop", "--bundlename", BROWSER_PKG], 10000); } catch {}
     await sleep(1000);
+    // Poll for surviving processes and SIGKILL stragglers
+    await forceKillBrowserProcesses();
 
     // 3. Start browser with CDP enabled
     var cmdArgs = buildLaunchArgs();
@@ -116,6 +183,7 @@ async function launchBrowser() {
 
 async function closeBrowser() {
     try { execOhosAa(["force-stop", "--bundlename", BROWSER_PKG], 10000); } catch {}
+    await forceKillBrowserProcesses();
 }
 
 // ─── CDP endpoint discovery ──────────────────────────────────────────

package/lib/node-runner.js

@@ -18,7 +18,48 @@ const querystring = require("querystring");
  */
 function runInNode(opts) {
     return new Promise((resolve, reject) => {
+        // Keep a console restore callback so quiet mode never leaks into the host process
+        let restoreConsole = null;
         try {
+            // Set global.options for test files that depend on it (same as renderer.js),
+            // done first so any require below can already see the options
+            global.options = opts;
+            // Load mocha BEFORE overriding console: mocha's lib/reporters/base.js
+            // captures console references at module-load time, so requiring it
+            // after the quiet-mode noop overwrite would silence the spec
+            // reporter's "passing/failing" output as well
+            try {
+                require('mocha/mocha');
+            }
+            catch (e) {
+                // mocha browser bundle not available, that's fine for headless mode
+            }
+            const Mocha = require('mocha');
+            // Save the original console methods; when quiet is requested, replace the
+            // documented console[log/info/error/warn/dir] methods with no-ops
+            // (mirrors upstream renderer.js setupConsoleOutput behavior)
+            const originalConsole = {
+                log: console.log,
+                info: console.info,
+                error: console.error,
+                warn: console.warn,
+                dir: console.dir,
+            };
+            const noop = () => { };
+            if (opts.quiet) {
+                console.log = noop;
+                console.info = noop;
+                console.error = noop;
+                console.warn = noop;
+                console.dir = noop;
+            }
+            restoreConsole = () => {
+                console.log = originalConsole.log;
+                console.info = originalConsole.info;
+                console.error = originalConsole.error;
+                console.warn = originalConsole.warn;
+                console.dir = originalConsole.dir;
+            };
             // Set up jsdom environment for DOM-dependent tests
             // jsdom provides a real DOM implementation (not a stub)
             const { JSDOM } = require('jsdom');
@@ -37,15 +78,8 @@ function runInNode(opts) {
             catch (e) {
                 // navigator is a getter in Node.js >= 21, skip it
             }
-            // Load mocha browser support if available (sets up global mocha for bdd)
-            try {
-                require('mocha/mocha');
-            }
-            catch (e) {
-                // mocha browser bundle not available, that's fine for headless mode
-            }
             // In headless mode, use Node.js Mocha API (same as renderer.js does)
-            const Mocha = require('mocha');
+            // Mocha already required above (before console override)
             // Parse reporter options (same logic as renderer.js)
             let reporterOptions;
             if (typeof opts.reporterOptions === 'string') {
@@ -97,10 +131,13 @@ function runInNode(opts) {
             }
             // Add resolved files to Mocha
             resolvedFiles.forEach((file) => mochaInst.addFile(file));
-            // Set global.options for test files that depend on it (same as renderer.js)
-            global.options = opts;
             // Run tests
             mochaInst.run((errorCount) => {
+                // Restore console methods so the host process is not polluted by quiet mode
+                if (restoreConsole) {
+                    restoreConsole();
+                    restoreConsole = null;
+                }
                 if (errorCount > 0) {
                     // No error needed, Mocha will report this (same as renderer.js)
                     reject(new Error('Mocha tests failed.'));
@@ -111,6 +148,11 @@ function runInNode(opts) {
             });
         }
         catch (e) {
+            // Restore console methods on failure as well
+            if (restoreConsole) {
+                restoreConsole();
+                restoreConsole = null;
+            }
             reject(new Error(`Node.js test runner error: ${e.message}`));
         }
     });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ohos-ports/floss",
-  "version": "5.0.1-beta.6",
+  "version": "5.0.1-beta.8",
   "description": "Unit-testing for those hard to reach places",
   "bin": "./lib/floss.js",
   "main": "./lib/index.js",