test: clean up mac brave browser

Author: nattb8

.github/workflows/ui-tests.yml

@@ -158,6 +158,12 @@ jobs:
           BROWSERSTACK_ACCESS_KEY: ${{ secrets.BROWSERSTACK_ACCESS_KEY }}
         working-directory: sample-unity6/Tests
         run: pytest -xs test/test_mac.py::MacTest
+      - name: Close Brave Browser
+        if: always()
+        run: |
+          osascript -e 'tell application "Brave Browser" to quit' 2>/dev/null || true
+          sleep 2
+          pkill -f "Brave Browser" 2>/dev/null || true
       - name: Remove temporary keychain
         if: always()
         run: |
@@ -400,6 +406,12 @@ jobs:
           BROWSERSTACK_ACCESS_KEY: ${{ secrets.BROWSERSTACK_ACCESS_KEY }}
         working-directory: ${{ matrix.projectPath }}/Tests
         run: ${{ matrix.test_script }}
+      - name: Close Brave Browser
+        if: contains(matrix.targetPlatform, 'StandaloneOSX') && always()
+        run: |
+          osascript -e 'tell application "Brave Browser" to quit' 2>/dev/null || true
+          sleep 2
+          pkill -f "Brave Browser" 2>/dev/null || true
       - name: Remove temporary keychain
         if: contains(matrix.targetPlatform, 'StandaloneOSX') && (github.event_name != 'workflow_dispatch' || github.event.inputs.targetPlatform == 'All' || github.event.inputs.targetPlatform == matrix.targetPlatform)
         run: |

sample/Tests/test/test_mac.py

@@ -37,6 +37,33 @@ def tearDownClass(cls):
         cls.altdriver.stop()
         cls.stop_browser()
 
+    @classmethod
+    def ensure_browser_clean(cls):
+        """Kill any running Brave instance and delete session restore files.
+        Call this before any action that may open the browser (login, logout, etc.)
+        so Brave always starts with a clean slate."""
+        result = subprocess.run(["pgrep", "-f", "Brave Browser"], capture_output=True, text=True)
+        if result.returncode == 0:
+            print("Brave Browser already running, stopping it...")
+            subprocess.run(["osascript", "-e", 'tell application "Brave Browser" to quit'],
+                           check=False, capture_output=True, timeout=5)
+            time.sleep(2)
+            subprocess.run(["pkill", "-f", "Brave Browser"], check=False, capture_output=True)
+            time.sleep(2)
+            print("Existing Brave Browser stopped")
+
+        brave_profile = os.path.expanduser(
+            "~/Library/Application Support/BraveSoftware/Brave-Browser/Default"
+        )
+        for session_file in ["Current Session", "Current Tabs", "Last Session", "Last Tabs"]:
+            filepath = os.path.join(brave_profile, session_file)
+            try:
+                if os.path.exists(filepath):
+                    os.remove(filepath)
+                    print(f"Removed {session_file}")
+            except OSError:
+                pass
+
     @classmethod
     def launch_browser(cls):
         print("Starting Browser...")
@@ -54,18 +81,7 @@ def launch_browser(cls):
             print("Brave Browser executable not found.")
             exit(1)
 
-        # Delete session/tab restore files so Brave starts with a clean slate
-        brave_profile = os.path.expanduser(
-            "~/Library/Application Support/BraveSoftware/Brave-Browser/Default"
-        )
-        for session_file in ["Current Session", "Current Tabs", "Last Session", "Last Tabs"]:
-            path = os.path.join(brave_profile, session_file)
-            try:
-                if os.path.exists(path):
-                    os.remove(path)
-                    print(f"Removed {session_file}")
-            except OSError:
-                pass
+        cls.ensure_browser_clean()
 
         subprocess.Popen([
             browser_path,
@@ -76,11 +92,10 @@ def launch_browser(cls):
             "--restore-last-session=false"
         ])
 
-        # Give Brave more time to fully initialize remote debugging
         print("Waiting for Brave to fully initialize...")
         time.sleep(10)
 
-        # Dismiss any macOS keychain dialog that may appear from a previous failed cleanup
+        # Dismiss any macOS keychain dialog from a previous failed cleanup
         subprocess.run([
             "osascript", "-e",
             'tell application "System Events"\n'
@@ -92,8 +107,7 @@ def launch_browser(cls):
             'end tell'
         ], check=False, capture_output=True, timeout=5)
         time.sleep(1)
-        
-        # Verify remote debugging is accessible
+
         try:
             import urllib.request
             with urllib.request.urlopen("http://127.0.0.1:9222/json", timeout=5) as response:
@@ -107,34 +121,23 @@ def launch_browser(cls):
     def stop_browser(cls):
         print("Stopping Brave Browser...")
         try:
-            # Close all tabs first so the browser won't restore them on next launch
             subprocess.run([
                 "osascript", "-e",
-                'tell application "Brave Browser" to repeat while (count of windows) > 0\n'
-                'tell front window to close\n'
-                'end repeat'
-            ], check=False, capture_output=True, timeout=10)
-            time.sleep(1)
-
-            subprocess.run([
-                "osascript", "-e", 
                 'tell application "Brave Browser" to quit'
             ], check=False, capture_output=True, timeout=10)
             time.sleep(2)
-            
-            # Check if still running, then force kill
-            result = subprocess.run(["pgrep", "-f", "Brave Browser"], 
-                                  capture_output=True, text=True)
+
+            result = subprocess.run(["pgrep", "-f", "Brave Browser"],
+                                    capture_output=True, text=True)
             if result.returncode == 0:
-                # Still running, force kill
-                subprocess.run(["pkill", "-f", "Brave Browser"], 
-                             check=False, capture_output=True)
+                subprocess.run(["pkill", "-f", "Brave Browser"],
+                               check=False, capture_output=True)
                 print("Killed Brave Browser processes")
-            
+
             print("Brave Browser has been closed.")
         except Exception as e:
             print("Brave Browser might not be running.")
-        
+
         time.sleep(3)
         print("Stopped Brave Browser")