test(ui): stabilize macOS login and upload Player.log

Author: rodrigo-fournier-immutable

.github/workflows/ui-tests.yml

@@ -156,6 +156,43 @@ jobs:
           BROWSERSTACK_ACCESS_KEY: ${{ secrets.BROWSERSTACK_ACCESS_KEY }}
         working-directory: sample-unity6/Tests
         run: pytest -xs test/test_mac.py::MacTest
+      - name: Collect Unity Player logs (macOS)
+        if: always()
+        run: |
+          set -euo pipefail
+          workspaceLogs="${{ github.workspace }}/sample-unity6/player-logs"
+          zipPath="${{ github.workspace }}/sample-unity6/Unity6-macOS-PlayerLogs.zip"
+          mkdir -p "$workspaceLogs"
+
+          # Unity Player.log location on macOS
+          unityLogsDir="$HOME/Library/Logs/Unity"
+          if [ -d "$unityLogsDir" ]; then
+            cp -R "$unityLogsDir" "$workspaceLogs/UnityLogs" || true
+            echo "Copied Unity logs from: $unityLogsDir"
+          else
+            echo "Unity logs directory not found: $unityLogsDir"
+          fi
+
+          # Try to collect crash reports (if any)
+          diagDir="$HOME/Library/Logs/DiagnosticReports"
+          if [ -d "$diagDir" ]; then
+            mkdir -p "$workspaceLogs/DiagnosticReports"
+            cp -R "$diagDir/"*Sample*Unity*6*macOS* "$workspaceLogs/DiagnosticReports/" 2>/dev/null || true
+            cp -R "$diagDir/"*Unity* "$workspaceLogs/DiagnosticReports/" 2>/dev/null || true
+            echo "Attempted to copy DiagnosticReports from: $diagDir"
+          else
+            echo "DiagnosticReports directory not found: $diagDir"
+          fi
+
+          rm -f "$zipPath" || true
+          (cd "${{ github.workspace }}/sample-unity6" && zip -r "Unity6-macOS-PlayerLogs.zip" "player-logs" >/dev/null) || true
+          echo "Player logs zip created: $zipPath"
+      - name: Upload Unity Player logs (macOS)
+        if: always()
+        uses: actions/upload-artifact@v4
+        with:
+          name: Unity6-macOS-Player-Logs
+          path: sample-unity6/Unity6-macOS-PlayerLogs.zip
       - name: Remove temporary keychain
         if: always()
         run: |

sample/Tests/test/test_mac.py

@@ -186,7 +186,7 @@ def test_1_login(self):
         for attempt in range(2):
             try:
                 # Check app state
-                login_button = self.altdriver.find_object(By.NAME, "LoginBtn")
+                login_button = self.altdriver.wait_for_object(By.NAME, "LoginBtn")
                 print("Found login button, app is in the correct state")
 
                 # Login
@@ -208,7 +208,44 @@ def test_1_login(self):
 
                     # Relogin
                     print("Try reset the app and log out once...")
-                    self.altdriver.wait_for_object(By.NAME, "ReloginBtn").tap()
+                    bring_sample_app_to_foreground()
+
+                    # Determine which scene we're in before trying to use ReloginBtn.
+                    # CI can occasionally be out-of-sync (still unauthenticated / mid-transition).
+                    scene_deadline = time.time() + 30
+                    current_scene = ""
+                    while time.time() < scene_deadline:
+                        try:
+                            current_scene = self.altdriver.get_current_scene()
+                            if current_scene in ("AuthenticatedScene", "UnauthenticatedScene"):
+                                break
+                        except Exception:
+                            pass
+                        time.sleep(1)
+                    print(f"Current scene before reset attempt: {current_scene}")
+
+                    if current_scene != "AuthenticatedScene":
+                        # If we're not authenticated, there's nothing to "reset" via Relogin+Logout.
+                        # Ensure browser is closed and just retry the normal login flow.
+                        self.stop_browser()
+                        print("Not in AuthenticatedScene; skipping ReloginBtn reset and retrying login...")
+                        time.sleep(5)
+                        continue
+
+                    # Some runs fail because we try to locate ReloginBtn while not on the right scene.
+                    # Wait for AuthenticatedScene explicitly, then try ReloginBtn, with fallback diagnostics.
+                    self.altdriver.wait_for_current_scene_to_be("AuthenticatedScene", timeout=60)
+                    try:
+                        self.altdriver.wait_for_object(By.NAME, "ReloginBtn", timeout=60).tap()
+                    except Exception as relogin_err:
+                        # Fallback: if ReloginBtn is unexpectedly missing, print the scene and try LoginBtn.
+                        try:
+                            print(f"ReloginBtn not found on scene={self.altdriver.get_current_scene()}: {relogin_err}")
+                        except Exception:
+                            print(f"ReloginBtn not found and could not read current scene: {relogin_err}")
+                        # This keeps the test resilient if the UI changed but still provides a login entrypoint.
+                        self.stop_browser()
+                        raise
 
                     # Wait for authenticated screen
                     self.altdriver.wait_for_current_scene_to_be("AuthenticatedScene")
@@ -231,4 +268,4 @@ def test_3_passport_functions(self):
         self.test_1_passport_functions()
 
     def test_5_zkevm_functions(self):
-        self.test_3_zkevm_functions()
+        self.test_3_zkevm_functions()