Adding upstream version 86.0.1.upstream/86.0.1upstream

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

2 files changed, 63 insertions, 0 deletions

diff --git a/toolkit/components/processtools/tests/xpcshell/test_process_kill.js b/toolkit/components/processtools/tests/xpcshell/test_process_kill.js
new file mode 100644
index 0000000000..e8dce6d364
--- /dev/null
+++ b/toolkit/components/processtools/tests/xpcshell/test_process_kill.js
@@ -0,0 +1,57 @@
+/* eslint-disable mozilla/no-arbitrary-setTimeout */
+"use strict";
+
+const { AppConstants } = ChromeUtils.import(
+  "resource://gre/modules/AppConstants.jsm"
+);
+const { setTimeout } = ChromeUtils.import("resource://gre/modules/Timer.jsm");
+
+const { Subprocess } = ChromeUtils.import(
+  "resource://gre/modules/Subprocess.jsm"
+);
+
+const ProcessTools = Cc["@mozilla.org/processtools-service;1"].getService(
+  Ci.nsIProcessToolsService
+);
+
+const env = Cc["@mozilla.org/process/environment;1"].getService(
+  Ci.nsIEnvironment
+);
+
+let PYTHON;
+
+// Find Python.
+add_task(async function setup() {
+  PYTHON = await Subprocess.pathSearch(env.get("PYTHON"));
+});
+
+// Ensure that killing a process... kills the process.
+add_task(async function test_subprocess_kill() {
+  // We launch Python, as it's a long-running process and it exists
+  // on all desktop platforms on which we run tests.
+  let proc = await Subprocess.call({
+    command: PYTHON,
+    arguments: [],
+  });
+
+  let isTerminated = false;
+
+  proc.wait().then(() => {
+    isTerminated = true;
+  });
+
+  await new Promise(resolve => setTimeout(resolve, 100));
+  Assert.ok(
+    !isTerminated,
+    "We haven't killed the process yet, it should still be running."
+  );
+
+  // Time to kill the process.
+  ProcessTools.kill(proc.pid);
+
+  await new Promise(resolve => setTimeout(resolve, 100));
+  Assert.ok(
+    isTerminated,
+    "We have killed the process already, it shouldn't be running anymore."
+  );
+});
diff --git a/toolkit/components/processtools/tests/xpcshell/xpcshell.ini b/toolkit/components/processtools/tests/xpcshell/xpcshell.ini
new file mode 100644
index 0000000000..972282c114
--- /dev/null
+++ b/toolkit/components/processtools/tests/xpcshell/xpcshell.ini
@@ -0,0 +1,6 @@
+[DEFAULT]
+firefox-appdir = browser
+skip-if = os == 'android'
+subprocess = true
+
+[test_process_kill.js]