detached f61e6a6

fix(store): keep failing_checks_block as a deprecated storage field, run the new subtests in parallel

commit
f61e6a68e9c866c042a8c5e4f64cae2b1290a363
author
brice · · 2026-10-21 16:19 UTC
parent
923f868
signature
GPG VerifiedCD88F9E564E0102646FB6077A1A07C7C7C3E349D · arch-gpg Verified for the committer email
checks
8/8
5 files · +21 -5
Unified
UnifiedSplit
M gen/ermite/storage/merge_request.pb.go +16 -3
@@ -345,6 +345,10 @@ type RepoSettings struct {
345345 state protoimpl.MessageState `protogen:"open.v1"`
346346 // Never empty once stored.
347347 AllowedMergeModes []MergeMode `protobuf:"varint,1,rep,packed,name=allowed_merge_modes,json=allowedMergeModes,proto3,enum=ermite.storage.MergeMode" json:"allowed_merge_modes,omitempty"`
348+ // Unused: never read, never written.
349+ //
350+ // Deprecated: Marked as deprecated in ermite/storage/merge_request.proto.
351+ FailingChecksBlock bool `protobuf:"varint,2,opt,name=failing_checks_block,json=failingChecksBlock,proto3" json:"failing_checks_block,omitempty"`
348352 // Who may write issues; unspecified reads as off.
349353 Issues IssuesMode `protobuf:"varint,3,opt,name=issues,proto3,enum=ermite.storage.IssuesMode" json:"issues,omitempty"`
350354 // Set on every write since merge commits exist: the modes are the explicit
@@ -394,6 +398,14 @@ func (x *RepoSettings) GetAllowedMergeModes() []MergeMode {
394398 return nil
395399 }
396400
401+// Deprecated: Marked as deprecated in ermite/storage/merge_request.proto.
402+func (x *RepoSettings) GetFailingChecksBlock() bool {
403+ if x != nil {
404+ return x.FailingChecksBlock
405+ }
406+ return false
407+}
408+
397409 func (x *RepoSettings) GetIssues() IssuesMode {
398410 if x != nil {
399411 return x.Issues
@@ -974,12 +986,13 @@ var File_ermite_storage_merge_request_proto protoreflect.FileDescriptor
974986
975987 const file_ermite_storage_merge_request_proto_rawDesc = "" +
976988 "\n" +
977- "\"ermite/storage/merge_request.proto\x12\x0eermite.storage\x1a\x1fgoogle/protobuf/timestamp.proto\"\xf9\x01\n" +
989+ "\"ermite/storage/merge_request.proto\x12\x0eermite.storage\x1a\x1fgoogle/protobuf/timestamp.proto\"\x93\x02\n" +
978990 "\fRepoSettings\x12I\n" +
979- "\x13allowed_merge_modes\x18\x01 \x03(\x0e2\x19.ermite.storage.MergeModeR\x11allowedMergeModes\x122\n" +
991+ "\x13allowed_merge_modes\x18\x01 \x03(\x0e2\x19.ermite.storage.MergeModeR\x11allowedMergeModes\x124\n" +
992+ "\x14failing_checks_block\x18\x02 \x01(\bB\x02\x18\x01R\x12failingChecksBlock\x122\n" +
980993 "\x06issues\x18\x03 \x01(\x0e2\x1a.ermite.storage.IssuesModeR\x06issues\x12$\n" +
981994 "\x0emerge_modes_v2\x18\x04 \x01(\bR\fmergeModesV2\x12(\n" +
982- "\x10allow_auto_merge\x18\x05 \x01(\bR\x0eallowAutoMergeJ\x04\b\x02\x10\x03R\x14failing_checks_block\"\x81\x05\n" +
995+ "\x10allow_auto_merge\x18\x05 \x01(\bR\x0eallowAutoMerge\"\x81\x05\n" +
983996 "\fMergeRequest\x12\x16\n" +
984997 "\x06number\x18\x01 \x01(\x03R\x06number\x12\x14\n" +
985998 "\x05title\x18\x02 \x01(\tR\x05title\x12 \n" +
@@ -345,6 +345,10 @@ type RepoSettings struct {
345 state protoimpl.MessageState `protogen:"open.v1"`345 state protoimpl.MessageState `protogen:"open.v1"`
346 // Never empty once stored.346 // Never empty once stored.
347 AllowedMergeModes []MergeMode `protobuf:"varint,1,rep,packed,name=allowed_merge_modes,json=allowedMergeModes,proto3,enum=ermite.storage.MergeMode" json:"allowed_merge_modes,omitempty"`347 AllowedMergeModes []MergeMode `protobuf:"varint,1,rep,packed,name=allowed_merge_modes,json=allowedMergeModes,proto3,enum=ermite.storage.MergeMode" json:"allowed_merge_modes,omitempty"`
348+ // Unused: never read, never written.
349+ //
350+ // Deprecated: Marked as deprecated in ermite/storage/merge_request.proto.
351+ FailingChecksBlock bool `protobuf:"varint,2,opt,name=failing_checks_block,json=failingChecksBlock,proto3" json:"failing_checks_block,omitempty"`
348 // Who may write issues; unspecified reads as off.352 // Who may write issues; unspecified reads as off.
349 Issues IssuesMode `protobuf:"varint,3,opt,name=issues,proto3,enum=ermite.storage.IssuesMode" json:"issues,omitempty"`353 Issues IssuesMode `protobuf:"varint,3,opt,name=issues,proto3,enum=ermite.storage.IssuesMode" json:"issues,omitempty"`
350 // Set on every write since merge commits exist: the modes are the explicit354 // Set on every write since merge commits exist: the modes are the explicit
@@ -394,6 +398,14 @@ func (x *RepoSettings) GetAllowedMergeModes() []MergeMode {
394 return nil398 return nil
395 }399 }
396 400
401+// Deprecated: Marked as deprecated in ermite/storage/merge_request.proto.
402+func (x *RepoSettings) GetFailingChecksBlock() bool {
403+ if x != nil {
404+ return x.FailingChecksBlock
405+ }
406+ return false
407+}
408+
397 func (x *RepoSettings) GetIssues() IssuesMode {409 func (x *RepoSettings) GetIssues() IssuesMode {
398 if x != nil {410 if x != nil {
399 return x.Issues411 return x.Issues
@@ -974,12 +986,13 @@ var File_ermite_storage_merge_request_proto protoreflect.FileDescriptor
974 986
975 const file_ermite_storage_merge_request_proto_rawDesc = "" +987 const file_ermite_storage_merge_request_proto_rawDesc = "" +
976 "\n" +988 "\n" +
977- "\"ermite/storage/merge_request.proto\x12\x0eermite.storage\x1a\x1fgoogle/protobuf/timestamp.proto\"\xf9\x01\n" +989+ "\"ermite/storage/merge_request.proto\x12\x0eermite.storage\x1a\x1fgoogle/protobuf/timestamp.proto\"\x93\x02\n" +
978 "\fRepoSettings\x12I\n" +990 "\fRepoSettings\x12I\n" +
979- "\x13allowed_merge_modes\x18\x01 \x03(\x0e2\x19.ermite.storage.MergeModeR\x11allowedMergeModes\x122\n" +991+ "\x13allowed_merge_modes\x18\x01 \x03(\x0e2\x19.ermite.storage.MergeModeR\x11allowedMergeModes\x124\n" +
992+ "\x14failing_checks_block\x18\x02 \x01(\bB\x02\x18\x01R\x12failingChecksBlock\x122\n" +
980 "\x06issues\x18\x03 \x01(\x0e2\x1a.ermite.storage.IssuesModeR\x06issues\x12$\n" +993 "\x06issues\x18\x03 \x01(\x0e2\x1a.ermite.storage.IssuesModeR\x06issues\x12$\n" +
981 "\x0emerge_modes_v2\x18\x04 \x01(\bR\fmergeModesV2\x12(\n" +994 "\x0emerge_modes_v2\x18\x04 \x01(\bR\fmergeModesV2\x12(\n" +
982- "\x10allow_auto_merge\x18\x05 \x01(\bR\x0eallowAutoMergeJ\x04\b\x02\x10\x03R\x14failing_checks_block\"\x81\x05\n" +995+ "\x10allow_auto_merge\x18\x05 \x01(\bR\x0eallowAutoMerge\"\x81\x05\n" +
983 "\fMergeRequest\x12\x16\n" +996 "\fMergeRequest\x12\x16\n" +
984 "\x06number\x18\x01 \x01(\x03R\x06number\x12\x14\n" +997 "\x06number\x18\x01 \x01(\x03R\x06number\x12\x14\n" +
985 "\x05title\x18\x02 \x01(\tR\x05title\x12 \n" +998 "\x05title\x18\x02 \x01(\tR\x05title\x12 \n" +
M internal/adapters/rpc/mergerequest_test.go +1 -0
@@ -241,6 +241,7 @@ func TestMergeRequestServiceMarkReady(t *testing.T) {
241241 {name: "without mr:write", err: domain.ErrForbidden, code: connect.CodePermissionDenied},
242242 } {
243243 t.Run(tt.name, func(t *testing.T) {
244+ t.Parallel()
244245 mrs := mocks.NewMergeRequestService(t)
245246 title, err := domain.ParseMRTitle("Ready")
246247 require.NoError(t, err)
@@ -241,6 +241,7 @@ func TestMergeRequestServiceMarkReady(t *testing.T) {
241 {name: "without mr:write", err: domain.ErrForbidden, code: connect.CodePermissionDenied},241 {name: "without mr:write", err: domain.ErrForbidden, code: connect.CodePermissionDenied},
242 } {242 } {
243 t.Run(tt.name, func(t *testing.T) {243 t.Run(tt.name, func(t *testing.T) {
244+ t.Parallel()
244 mrs := mocks.NewMergeRequestService(t)245 mrs := mocks.NewMergeRequestService(t)
245 title, err := domain.ParseMRTitle("Ready")246 title, err := domain.ParseMRTitle("Ready")
246 require.NoError(t, err)247 require.NoError(t, err)
M internal/adapters/web/mr_test.go +1 -0
@@ -302,6 +302,7 @@ func TestMergeIgnoreChecks(t *testing.T) {
302302 t.Parallel()
303303 for _, kind := range []string{"bad", "running", "ok", ""} {
304304 t.Run(kind, func(t *testing.T) {
305+ t.Parallel()
305306 box := (&Server{}).mergeBox(&repoData{repo: repoWithModes(domain.MergeModes()...)}, 3, "feat", "abc", true, mergeabilityView(domain.Mergeability{State: domain.MergeabilityUpToDate}, "main"))
306307 html := renderToString(t, mergeMenu(MRPage{Box: box, ChecksSum: ChecksSummary{Kind: kind}}))
307308 if kind == "bad" || kind == "running" {
@@ -302,6 +302,7 @@ func TestMergeIgnoreChecks(t *testing.T) {
302 t.Parallel()302 t.Parallel()
303 for _, kind := range []string{"bad", "running", "ok", ""} {303 for _, kind := range []string{"bad", "running", "ok", ""} {
304 t.Run(kind, func(t *testing.T) {304 t.Run(kind, func(t *testing.T) {
305+ t.Parallel()
305 box := (&Server{}).mergeBox(&repoData{repo: repoWithModes(domain.MergeModes()...)}, 3, "feat", "abc", true, mergeabilityView(domain.Mergeability{State: domain.MergeabilityUpToDate}, "main"))306 box := (&Server{}).mergeBox(&repoData{repo: repoWithModes(domain.MergeModes()...)}, 3, "feat", "abc", true, mergeabilityView(domain.Mergeability{State: domain.MergeabilityUpToDate}, "main"))
306 html := renderToString(t, mergeMenu(MRPage{Box: box, ChecksSum: ChecksSummary{Kind: kind}}))307 html := renderToString(t, mergeMenu(MRPage{Box: box, ChecksSum: ChecksSummary{Kind: kind}}))
307 if kind == "bad" || kind == "running" {308 if kind == "bad" || kind == "running" {
M internal/adapters/web/summary_actions_test.go +1 -0
@@ -133,6 +133,7 @@ func TestMRChecksLiveMergeControls(t *testing.T) {
133133 head := strings.Repeat("a", domain.ObjectIDLen)
134134 for _, kind := range []string{"bad", "running", "ok", ""} {
135135 t.Run(kind, func(t *testing.T) {
136+ t.Parallel()
136137 runs := mocks.NewRunService(t)
137138 var checks []ports.CheckView
138139 if kind != "" {
@@ -133,6 +133,7 @@ func TestMRChecksLiveMergeControls(t *testing.T) {
133 head := strings.Repeat("a", domain.ObjectIDLen)133 head := strings.Repeat("a", domain.ObjectIDLen)
134 for _, kind := range []string{"bad", "running", "ok", ""} {134 for _, kind := range []string{"bad", "running", "ok", ""} {
135 t.Run(kind, func(t *testing.T) {135 t.Run(kind, func(t *testing.T) {
136+ t.Parallel()
136 runs := mocks.NewRunService(t)137 runs := mocks.NewRunService(t)
137 var checks []ports.CheckView138 var checks []ports.CheckView
138 if kind != "" {139 if kind != "" {
M proto/ermite/storage/merge_request.proto +2 -2
@@ -22,8 +22,8 @@ enum MergeMode {
2222 message RepoSettings {
2323 // Never empty once stored.
2424 repeated MergeMode allowed_merge_modes = 1;
25- reserved 2;
26- reserved "failing_checks_block";
25+ // Unused: never read, never written.
26+ bool failing_checks_block = 2 [deprecated = true];
2727 // Who may write issues; unspecified reads as off.
2828 IssuesMode issues = 3;
2929 // Set on every write since merge commits exist: the modes are the explicit
@@ -22,8 +22,8 @@ enum MergeMode {
22 message RepoSettings {22 message RepoSettings {
23 // Never empty once stored.23 // Never empty once stored.
24 repeated MergeMode allowed_merge_modes = 1;24 repeated MergeMode allowed_merge_modes = 1;
25- reserved 2;25+ // Unused: never read, never written.
26- reserved "failing_checks_block";26+ bool failing_checks_block = 2 [deprecated = true];
27 // Who may write issues; unspecified reads as off.27 // Who may write issues; unspecified reads as off.
28 IssuesMode issues = 3;28 IssuesMode issues = 3;
29 // Set on every write since merge commits exist: the modes are the explicit29 // Set on every write since merge commits exist: the modes are the explicit

Keyboard shortcuts

Single-key shortcuts are on. ctrl k and esc work whatever this says.

ctrl k :
go to a section, branch, tag, file or repository
?
this list
j k
move the row cursor down / up
enter
open the row under the cursor; on Files, a directory opens or closes in place
↑ ↓ ← → home end
in the file tree (focus on a row): previous / next row, close / open a directory or go to its parent / first entry, first / last row. They never open a file
l h
on Files: open a directory or a file / close a directory or go up to its parent, then to the parent page. Elsewhere: into the side panel (on a merge request, its files) / back to the content; there j k move between its controls
g g G
first / last row
/
filter the list; on Files, find a file anywhere in the repository (esc clears, enter opens the best match)
b
switch branch or tag
g s g f g c g b g m g i g r g a
tabs: summary, files, commits, branches & tags, merge requests, issues, releases, actions (when available)
g h
home
w
wide mode: use the whole width of the screen, or not (remembered)
y
copy a permalink pinned to the commit
d u x
diff: split / unified / collapse or expand all
e E
diff: the whole file in view / every file, with the lines the hunks hide
n
merge request: next note in the diff
esc
close a dialog, leave a field

Branches 2

Tags 44

↑↓ moveenter openesc close