test: keep both store test additions after merging the review fixes
This commit is contained in:
parent
fa96a398ee
commit
c35ad47097
1 changed files with 3 additions and 3 deletions
|
|
@ -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
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue