From 5b258849d3ca5417cad6af9a442ced254ff758ff Mon Sep 17 00:00:00 2001
From: huanghuoguoguo <60681390+huanghuoguoguo@users.noreply.github.com>
Date: Wed, 28 Oct 2026 12:08:56 +0800
Subject: [PATCH] fix(regression): continue job cleanup after state persistence
 failure

---
 tools/regression_job.py      |  5 ++++-
 tools/test_regression_job.py | 27 +++++++++++++++++++++++++++
 2 files changed, 31 insertions(+), 1 deletion(-)

diff --git a/tools/regression_job.py b/tools/regression_job.py
index 638b822aa..775afc7a5 100644
--- a/tools/regression_job.py
+++ b/tools/regression_job.py
@@ -459,7 +459,10 @@ class Job:
                 result['errors'] = list(dict.fromkeys([*result['errors'], *summary['errors']]))
             if result['completed']:
                 self.state['phase'] = 'finished'
-                self.save()
+                try:
+                    self.save()
+                except OSError as exc:
+                    result['errors'].append('state persistence: ' + self.redact(str(exc)))
             try:
                 self.collect()
             except (RuntimeError, ValueError, OSError, subprocess.TimeoutExpired) as exc:
diff --git a/tools/test_regression_job.py b/tools/test_regression_job.py
index 3cfdd0d7e..a20caf0bf 100644
--- a/tools/test_regression_job.py
+++ b/tools/test_regression_job.py
@@ -8,6 +8,7 @@ import shutil
 import sys
 import tempfile
 import threading
+from types import SimpleNamespace
 import unittest
 from unittest.mock import patch
 
@@ -247,6 +248,32 @@ class JobTests(unittest.TestCase):
                 self.assertEqual(result['errors'], result['suite']['errors'])
                 self.assertEqual(result['completed'], failure != 'prepare')
 
+    def test_finished_state_save_failure_does_not_skip_collection_or_cleanup(self):
+        with tempfile.TemporaryDirectory() as folder:
+            root = Path(folder)
+            job = Job({'cleanup': 'always'}, profile(), root / 'profile.json', root / 'job')
+            suite = SimpleNamespace(run=lambda: {'errors': []}, finish=lambda summary: None)
+            events = []
+            save = job.save
+
+            def failing_save():
+                if job.state['phase'] == 'finished':
+                    raise OSError('state disk unavailable')
+                save()
+
+            with (
+                patch.object(job, 'prepare', return_value=suite),
+                patch.object(job, 'save', side_effect=failing_save),
+                patch.object(job, 'collect', side_effect=lambda: events.append('collect')),
+                patch.object(job, 'cleanup', side_effect=lambda: events.append('cleanup')),
+            ):
+                result = job.run()
+            self.assertEqual(events, ['collect', 'cleanup'])
+            self.assertTrue(result['completed'])
+            self.assertFalse(result['passed'])
+            self.assertEqual(result['errors'], ['state persistence: state disk unavailable'])
+            self.assertEqual(json.loads((job.output / 'summary.json').read_text()), result)
+
     def test_cleanup_refuses_changed_deployment(self):
         with tempfile.TemporaryDirectory() as folder:
             root = Path(folder)