diff options
author | Gavin Mak <gavinmak@google.com> | 2025-08-13 23:42:00 -0700 |
---|---|---|
committer | LUCI <gerrit-scoped@luci-project-accounts.iam.gserviceaccount.com> | 2025-08-14 09:54:15 -0700 |
commit | d534a5537fd317cd769fed54eceb8248777db701 (patch) | |
tree | 2c036f9540f0eb723ab48ba28549758033ecc269 /tests/test_subcmds_sync.py | |
parent | a64149a7a77814132629bbb4c07d922c2222df25 (diff) | |
download | git-repo-d534a5537fd317cd769fed54eceb8248777db701.tar.gz |
sync: Fix missing error details in interleaved summary
When checkout errors occurred in interleaved sync, they were wrapped in
a SyncError with no message, causing blank lines in the final summary.
Refactor _SyncResult to hold a list of exceptions, ensuring the original
error messages are propagated correctly.
Bug: 438178765
Change-Id: Ic25e515068959829cb6290cfd9e4c2d3963bbbea
Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/498342
Reviewed-by: Scott Lee <ddoman@google.com>
Tested-by: Gavin Mak <gavinmak@google.com>
Commit-Queue: Gavin Mak <gavinmak@google.com>
Diffstat (limited to 'tests/test_subcmds_sync.py')
-rw-r--r-- | tests/test_subcmds_sync.py | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/tests/test_subcmds_sync.py b/tests/test_subcmds_sync.py index 940c69fc..6c9cc9ab 100644 --- a/tests/test_subcmds_sync.py +++ b/tests/test_subcmds_sync.py | |||
@@ -810,8 +810,8 @@ class InterleavedSyncTest(unittest.TestCase): | |||
810 | result = result_obj.results[0] | 810 | result = result_obj.results[0] |
811 | self.assertTrue(result.fetch_success) | 811 | self.assertTrue(result.fetch_success) |
812 | self.assertTrue(result.checkout_success) | 812 | self.assertTrue(result.checkout_success) |
813 | self.assertIsNone(result.fetch_error) | 813 | self.assertEqual(result.fetch_errors, []) |
814 | self.assertIsNone(result.checkout_error) | 814 | self.assertEqual(result.checkout_errors, []) |
815 | project.Sync_NetworkHalf.assert_called_once() | 815 | project.Sync_NetworkHalf.assert_called_once() |
816 | project.Sync_LocalHalf.assert_called_once() | 816 | project.Sync_LocalHalf.assert_called_once() |
817 | 817 | ||
@@ -833,8 +833,8 @@ class InterleavedSyncTest(unittest.TestCase): | |||
833 | 833 | ||
834 | self.assertFalse(result.fetch_success) | 834 | self.assertFalse(result.fetch_success) |
835 | self.assertFalse(result.checkout_success) | 835 | self.assertFalse(result.checkout_success) |
836 | self.assertEqual(result.fetch_error, fetch_error) | 836 | self.assertEqual(result.fetch_errors, [fetch_error]) |
837 | self.assertIsNone(result.checkout_error) | 837 | self.assertEqual(result.checkout_errors, []) |
838 | project.Sync_NetworkHalf.assert_called_once() | 838 | project.Sync_NetworkHalf.assert_called_once() |
839 | project.Sync_LocalHalf.assert_not_called() | 839 | project.Sync_LocalHalf.assert_not_called() |
840 | 840 | ||
@@ -871,7 +871,7 @@ class InterleavedSyncTest(unittest.TestCase): | |||
871 | 871 | ||
872 | self.assertFalse(result.fetch_success) | 872 | self.assertFalse(result.fetch_success) |
873 | self.assertFalse(result.checkout_success) | 873 | self.assertFalse(result.checkout_success) |
874 | self.assertEqual(result.fetch_error, fetch_error) | 874 | self.assertEqual(result.fetch_errors, [fetch_error]) |
875 | project.Sync_NetworkHalf.assert_called_once() | 875 | project.Sync_NetworkHalf.assert_called_once() |
876 | project.Sync_LocalHalf.assert_not_called() | 876 | project.Sync_LocalHalf.assert_not_called() |
877 | 877 | ||
@@ -893,8 +893,8 @@ class InterleavedSyncTest(unittest.TestCase): | |||
893 | 893 | ||
894 | self.assertTrue(result.fetch_success) | 894 | self.assertTrue(result.fetch_success) |
895 | self.assertFalse(result.checkout_success) | 895 | self.assertFalse(result.checkout_success) |
896 | self.assertIsNone(result.fetch_error) | 896 | self.assertEqual(result.fetch_errors, []) |
897 | self.assertEqual(result.checkout_error, checkout_error) | 897 | self.assertEqual(result.checkout_errors, [checkout_error]) |
898 | project.Sync_NetworkHalf.assert_called_once() | 898 | project.Sync_NetworkHalf.assert_called_once() |
899 | project.Sync_LocalHalf.assert_called_once() | 899 | project.Sync_LocalHalf.assert_called_once() |
900 | 900 | ||