Move browser init code to browser_common.py (#25749)

Author: sbc100

test/browser_common.py

@@ -3,6 +3,7 @@
 # University of Illinois/NCSA Open Source License.  Both these licenses can be
 # found in the LICENSE file.
 
+import atexit
 import logging
 import os
 import plistlib
@@ -118,6 +119,23 @@ def terminate_list_of_processes(proc_list):
       pass
 
 
+def init(force_browser_process_termination):
+  utils.delete_file(browser_spawn_lock_filename)
+  utils.delete_file(f'{browser_spawn_lock_filename}_counter')
+  if force_browser_process_termination or os.getenv('EMTEST_FORCE_BROWSER_PROCESS_TERMINATION'):
+    config = get_browser_config()
+
+    if config and hasattr(config, 'executable_name'):
+      def terminate_all_browser_processes():
+        procs = list_processes_by_name(config.executable_name)
+        if len(procs) > 0:
+          print(f'Terminating {len(procs)} stray browser processes.')
+          terminate_list_of_processes(procs)
+
+      atexit.register(terminate_all_browser_processes)
+      terminate_all_browser_processes()
+
+
 def find_browser_test_file(filename):
   """Looks for files in test/browser and then in test/
   """

test/runner.py

@@ -581,20 +581,8 @@ def set_env(name, option_value):
   # Remove any old test files before starting the run
   cleanup_emscripten_temp()
   utils.delete_file(common.flaky_tests_log_filename)
-  utils.delete_file(browser_common.browser_spawn_lock_filename)
-  utils.delete_file(f'{browser_common.browser_spawn_lock_filename}_counter')
-  if options.force_browser_process_termination or os.getenv('EMTEST_FORCE_BROWSER_PROCESS_TERMINATION'):
-    config = browser_common.get_browser_config()
-
-    def terminate_all_browser_processes():
-      procs = browser_common.list_processes_by_name(config.executable_name)
-      if len(procs) > 0:
-        print(f'Terminating {len(procs)} stray browser processes.')
-        browser_common.terminate_list_of_processes(procs)
-
-    if config and hasattr(config, 'executable_name'):
-      atexit.register(terminate_all_browser_processes)
-      terminate_all_browser_processes()
+
+  browser_common.init(options.force_browser_process_termination)
 
   def prepend_default(arg):
     if arg.startswith('test_'):