From: Christian Brauner <brauner@kernel.org>
To: "Kernel.org Tools" <tools@kernel.org>
Cc: "Christian Brauner (Amutable)" <brauner@kernel.org>,
Konstantin Ryabitsev <konstantin@linuxfoundation.org>
Subject: [PATCH b4 v2 11/44] tests: cover the take statuses in the thank-and-archive chain
Date: Fri, 31 Jul 2026 23:58:52 +0200 [thread overview]
Message-ID: <20260731-work-b4-editor-branch-guard-v2-11-243fd19d322d@kernel.org> (raw)
In-Reply-To: <20260731-work-b4-editor-branch-guard-v2-0-243fd19d322d@kernel.org>
Add the two cases that used to come back as None: accept unchecked in
the dialog, and a take whose tracking data could not be read back. The
unrecorded status must not reach the status column.
Signed-off-by: Christian Brauner (Amutable) <brauner@kernel.org>
---
src/tests/test_tui_tracking.py | 50 +++++++++++++++++++++++++++++++++++++++---
1 file changed, 47 insertions(+), 3 deletions(-)
diff --git a/src/tests/test_tui_tracking.py b/src/tests/test_tui_tracking.py
index 6a3f2f8..09d1fea 100644
--- a/src/tests/test_tui_tracking.py
+++ b/src/tests/test_tui_tracking.py
@@ -2674,6 +2674,34 @@ class TestSeriesLifecycle:
assert all(p.get('taken') for p in patches), 'all patches should be taken'
assert updated['series']['status'] == 'accepted'
+ def test_record_take_metadata_unreadable_tracking(self, gitdir: str) -> None:
+ """The patches are applied by the time this runs, so a tracking commit
+ that cannot be read is a missing record and not a take that never
+ happened. Saying None for both leaves the caller unable to tell them
+ apart, and 'unrecorded' must not reach the status column either."""
+ change_id = 'take-unrecorded-1'
+ branch_name = _create_review_branch(
+ gitdir, change_id, identifier='test-unrecorded', status='reviewing'
+ )
+ app = TrackingApp.__new__(TrackingApp)
+ app._identifier = 'test-unrecorded'
+ app._selected_series = None
+
+ with patch.object(b4.review, 'load_tracking', side_effect=SystemExit(1)):
+ result = app._record_take_metadata(
+ gitdir, branch_name, 'master', ['abc'], accepted=True
+ )
+ assert result == 'unrecorded'
+
+ statuses: List[str] = []
+ with patch.object(
+ tracking,
+ 'update_series_status',
+ lambda conn, cid, status, revision=None: statuses.append(status),
+ ):
+ app._finalize_take(gitdir, 'master', change_id, {'revision': 1}, result)
+ assert not statuses
+
def test_record_take_metadata_branch_tip_is_target_not_head(
self, gitdir: str
) -> None:
@@ -4421,7 +4449,10 @@ class TestTakeThankArchiveChain:
flow only when the take leaves the series fully accepted."""
def _run_take_final(
- self, take_status: Optional[str], thank_and_archive: bool
+ self,
+ take_status: Optional[str],
+ thank_and_archive: bool,
+ accept_series: bool = True,
) -> Tuple[List[Tuple[Dict[str, Any], bool]], List[str]]:
"""Drive _on_take_final with a mocked take returning *take_status*.
@@ -4434,9 +4465,9 @@ class TestTakeThankArchiveChain:
notices: List[str] = []
app = TrackingApp.__new__(TrackingApp)
take_screen: Any = SimpleNamespace(
- accept_series=True, thank_and_archive=thank_and_archive
+ accept_series=accept_series, thank_and_archive=thank_and_archive
)
- confirm_screen: Any = SimpleNamespace(accept_series=True)
+ confirm_screen: Any = SimpleNamespace(accept_series=accept_series)
series = {'change_id': 'chain-1', 'subject': 'x', 'status': 'reviewing'}
with (
patch.object(TrackingApp, 'suspend', lambda self: contextlib.nullcontext()),
@@ -4491,6 +4522,19 @@ class TestTakeThankArchiveChain:
assert not thanks
assert any('take did not complete' in n for n in notices)
+ def test_unaccepted_take_does_not_chain(self) -> None:
+ thanks, notices = self._run_take_final(None, True, accept_series=False)
+ assert not thanks
+ assert any('not marked accepted' in n for n in notices)
+
+ def test_unrecorded_take_says_so(self) -> None:
+ """The patches went in but the tracking data could not be read, so
+ there is no coverage to chain on -- and 'did not complete' would send
+ the maintainer looking for an apply that did happen."""
+ thanks, notices = self._run_take_final('unrecorded', True)
+ assert not thanks
+ assert any('was not recorded' in n for n in notices)
+
def test_unchecked_box_never_chains(self) -> None:
thanks, notices = self._run_take_final('accepted', False)
assert not thanks
--
2.53.0
next prev parent reply other threads:[~2026-07-31 21:59 UTC|newest]
Thread overview: 46+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-07-31 21:58 [PATCH b4 v2 00/44] Stop the editor branch guard from eating review replies Christian Brauner
2026-07-31 21:58 ` [PATCH b4 v2 01/44] review-tui: mark all outgoing mail as read, not just " Christian Brauner
2026-07-31 21:58 ` [PATCH b4 v2 02/44] tests: cover the shared outgoing-seen helper Christian Brauner
2026-07-31 21:58 ` [PATCH b4 v2 03/44] review: close the messages database when auto-marking fails Christian Brauner
2026-07-31 21:58 ` [PATCH b4 v2 04/44] review: use the same busy timeout for both review databases Christian Brauner
2026-07-31 21:58 ` [PATCH b4 v2 05/44] review: drop the unused return value from set_flags_bulk() Christian Brauner
2026-07-31 21:58 ` [PATCH b4 v2 06/44] review: don't let archiving a series raise Christian Brauner
2026-07-31 21:58 ` [PATCH b4 v2 07/44] tests: cover an unwritable series archive Christian Brauner
2026-07-31 21:58 ` [PATCH b4 v2 08/44] review-tui: keep post-send bookkeeping out of the send error path Christian Brauner
2026-07-31 21:58 ` [PATCH b4 v2 09/44] tests: cover the thank-you send's post-send bookkeeping Christian Brauner
2026-07-31 21:58 ` [PATCH b4 v2 10/44] review-tui: say which way a take did not reach 'accepted' Christian Brauner
2026-07-31 21:58 ` Christian Brauner [this message]
2026-07-31 21:58 ` [PATCH b4 v2 12/44] review-tui: use the shared helper to delete a review branch Christian Brauner
2026-07-31 21:58 ` [PATCH b4 v2 13/44] ty: check reachability in the repository the commit landed in Christian Brauner
2026-07-31 21:58 ` [PATCH b4 v2 14/44] tests: cover the publish check using the repository it is given Christian Brauner
2026-07-31 21:58 ` [PATCH b4 v2 15/44] edit_in_editor: make the branch guard opt-in Christian Brauner
2026-07-31 21:58 ` [PATCH b4 v2 16/44] tests: cover the opt-in branch guard in edit_in_editor Christian Brauner
2026-07-31 21:58 ` [PATCH b4 v2 17/44] edit_in_editor: work in the tree the caller names Christian Brauner
2026-07-31 21:58 ` [PATCH b4 v2 18/44] tests: cover edit_in_editor working in the caller's tree Christian Brauner
2026-07-31 21:59 ` [PATCH b4 v2 19/44] ty: edit the thank-you review in the tree it was pointed at Christian Brauner
2026-07-31 21:59 ` [PATCH b4 v2 20/44] tests: cover the ty review editing in the named tree Christian Brauner
2026-07-31 21:59 ` [PATCH b4 v2 21/44] tui: route editor launches through one non-fatal helper Christian Brauner
2026-07-31 21:59 ` [PATCH b4 v2 22/44] tests: cover an editor failure leaving the review TUI standing Christian Brauner
2026-07-31 21:59 ` [PATCH b4 v2 23/44] review-tui: only put back a branch b4 checked out itself Christian Brauner
2026-07-31 21:59 ` [PATCH b4 v2 24/44] tests: cover the review TUI's branch-restore guard Christian Brauner
2026-07-31 21:59 ` [PATCH b4 v2 25/44] review-tui: put HEAD back where it was when it was not on a branch Christian Brauner
2026-07-31 21:59 ` [PATCH b4 v2 26/44] tests: cover the restore from a detached HEAD Christian Brauner
2026-07-31 21:59 ` [PATCH b4 v2 27/44] tests: pin the default branch in the queue-delivery fixture Christian Brauner
2026-07-31 21:59 ` [PATCH b4 v2 28/44] ty: an unknown remote tip is undetermined, not unpublished Christian Brauner
2026-07-31 21:59 ` [PATCH b4 v2 29/44] review-tui: keep post-send bookkeeping out of the review send error path Christian Brauner
2026-07-31 21:59 ` [PATCH b4 v2 30/44] tests: cover the review send's post-send bookkeeping Christian Brauner
2026-07-31 21:59 ` [PATCH b4 v2 31/44] review: close the tracking database when archiving fails Christian Brauner
2026-07-31 21:59 ` [PATCH b4 v2 32/44] review: clean up a review branch that cannot be finished Christian Brauner
2026-07-31 21:59 ` [PATCH b4 v2 33/44] tests: cover create_review_branch cleaning up a half-built branch Christian Brauner
2026-07-31 21:59 ` [PATCH b4 v2 34/44] review-tui: put the branch back after a revision upgrade Christian Brauner
2026-07-31 21:59 ` [PATCH b4 v2 35/44] tests: cover the revision upgrade's branch handling Christian Brauner
2026-07-31 21:59 ` [PATCH b4 v2 36/44] review-tui: restore the original branch however the tracking loop ends Christian Brauner
2026-07-31 21:59 ` [PATCH b4 v2 37/44] review-tui: do not let a failed tracking load skip the branch restore Christian Brauner
2026-07-31 21:59 ` [PATCH b4 v2 38/44] tests: cover the tracking TUI restoring the branch on the way out Christian Brauner
2026-07-31 21:59 ` [PATCH b4 v2 39/44] review-tui: close the tracking database when the status sync fails Christian Brauner
2026-07-31 21:59 ` [PATCH b4 v2 40/44] tests: cover the status sync closing its database Christian Brauner
2026-07-31 21:59 ` [PATCH b4 v2 41/44] review-tui: catch the exit a failed checkout reports itself with Christian Brauner
2026-07-31 21:59 ` [PATCH b4 v2 42/44] tests: cover a failed checkout leaving the tracking list standing Christian Brauner
2026-07-31 21:59 ` [PATCH b4 v2 43/44] review-tui: put the user back when the branch they are on is deleted Christian Brauner
2026-07-31 21:59 ` [PATCH b4 v2 44/44] tests: cover the branch delete leaving the worktree on a branch Christian Brauner
2026-08-03 14:59 ` [PATCH b4 v2 00/44] Stop the editor branch guard from eating review replies Konstantin Ryabitsev
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20260731-work-b4-editor-branch-guard-v2-11-243fd19d322d@kernel.org \
--to=brauner@kernel.org \
--cc=konstantin@linuxfoundation.org \
--cc=tools@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox