Adding upstream version 110.0.1.upstream/110.0.1upstream

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

1 files changed, 63 insertions, 0 deletions

diff --git a/testing/mozbase/mozprocess/tests/test_misc.py b/testing/mozbase/mozprocess/tests/test_misc.py
new file mode 100644
index 0000000000..a4908fe203
--- /dev/null
+++ b/testing/mozbase/mozprocess/tests/test_misc.py
@@ -0,0 +1,63 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+
+import os
+import sys
+
+import mozunit
+import proctest
+from mozprocess import processhandler
+
+here = os.path.dirname(os.path.abspath(__file__))
+
+
+class ProcTestMisc(proctest.ProcTest):
+    """Class to test misc operations"""
+
+    def test_process_timeout_no_kill(self):
+        """Process is started, runs but we time out waiting on it
+        to complete. Process should not be killed.
+        """
+        p = None
+
+        def timeout_handler():
+            self.assertEqual(p.proc.poll(), None)
+            p.kill()
+
+        myenv = None
+        # On macosx1014, subprocess fails to find `six` when run with python3.
+        # This ensures that subprocess first looks to sys.path to find `six`.
+        # See https://bugzilla.mozilla.org/show_bug.cgi?id=1562083
+        if sys.platform == "darwin" and sys.version_info[0] > 2:
+            myenv = os.environ.copy()
+            myenv["PYTHONPATH"] = ":".join(sys.path)
+
+        p = processhandler.ProcessHandler(
+            [self.python, self.proclaunch, "process_waittimeout.ini"],
+            cwd=here,
+            env=myenv,
+            onTimeout=(timeout_handler,),
+            kill_on_timeout=False,
+        )
+        p.run(timeout=1)
+        p.wait()
+        self.assertTrue(p.didTimeout)
+
+        self.determine_status(p, False, ["returncode", "didtimeout"])
+
+    def test_unicode_in_environment(self):
+        env = {
+            "FOOBAR": "ʘ",
+        }
+        p = processhandler.ProcessHandler(
+            [self.python, self.proclaunch, "process_normal_finish.ini"],
+            cwd=here,
+            env=env,
+        )
+        # passes if no exceptions are raised
+        p.run()
+        p.wait()
+
+
+if __name__ == "__main__":
+    mozunit.main()