diff --git a/internal/store/m2_test.go b/internal/store/m2_test.go index ff84522..b9c317b 100644 --- a/internal/store/m2_test.go +++ b/internal/store/m2_test.go @@ -718,7 +718,6 @@ func TestConfirmPendingIsSingleUseUnderConcurrency(t *testing.T) { } } -<<<<<<< HEAD func TestMigrationAddsTheOutboxPriorityAloneAfterAHalfDoneUpgrade(t *testing.T) { // A crash between adding post_id and priority leaves outbox with the first and not the second. path := t.TempDir() + "/old.db" @@ -738,7 +737,9 @@ func TestMigrationAddsTheOutboxPriorityAloneAfterAHalfDoneUpgrade(t *testing.T) defer s2.Close() if ok, err := hasColumn(s2.db, "outbox", "priority"); err != nil || !ok { t.Fatalf("priority is added back: %v %v", ok, err) -======= + } +} + func TestConfirmationMailGlobalCapIsConfigurable(t *testing.T) { s := newTestStore(t) if s.PendingPerHour != 300 { @@ -801,6 +802,5 @@ func TestPerAddressCapRefusalsAreNotLogged(t *testing.T) { } if len(logged) != 0 { t.Fatalf("the per-address cap is not the global one: %q", logged) ->>>>>>> fix/sr-web-limits } }