chore: Flaky tests + linter upgrade

Attempt to fix some flaky tests by adding more flushes.

Upgrade linter to v1.51.1 and fix reported issues.

.github/workflows/pull-request.yml

@@ -37,7 +37,7 @@ jobs:
       - name: Run golangci-lint
         uses: golangci/golangci-lint-action@v3
         with:
-          version: v1.50.0
+          version: v1.51.1
           args: --timeout=500s
           skip-cache: true
 

benchmarks/imaptest/main_test.go

@@ -47,6 +47,7 @@ func TestIMAPTest(t *testing.T) {
 	}
 }
 
+// nolint: musttag
 type config struct {
 	Cases    []caseConfig
 	Settings map[string]settingsConfig

store/store_test.go

@@ -2,15 +2,15 @@ package store_test
 
 import (
 	"bytes"
-	"github.com/ProtonMail/gluon/store/fallback_v0"
-	"math/rand"
+	"crypto/rand"
 	"os"
 	"path/filepath"
 	"runtime"
 	"testing"
 
 	"github.com/ProtonMail/gluon/imap"
 	"github.com/ProtonMail/gluon/store"
+	"github.com/ProtonMail/gluon/store/fallback_v0"
 	"github.com/stretchr/testify/require"
 )
 

tests/close_test.go

@@ -14,7 +14,7 @@ func TestClose(t *testing.T) {
 	// This test is still useful as we have no way of checking the fetch responses after the store command.
 	// Additionally, we also need to ensure that there are no unilateral EXPUNGE messages returned from the server after close.
 	// There is currently no way to check for this with the go imap client.
-	runManyToOneTestWithAuth(t, defaultServerOptions(t), []int{1, 2}, func(c map[int]*testConnection, _ *testSession) {
+	runManyToOneTestWithAuth(t, defaultServerOptions(t), []int{1, 2}, func(c map[int]*testConnection, s *testSession) {
 		c[1].C("b001 CREATE saved-messages")
 		c[1].S("b001 OK CREATE")
 
@@ -52,6 +52,8 @@ func TestClose(t *testing.T) {
 		c[1].S(`* 3 FETCH (FLAGS (\Deleted \Recent \Seen))`)
 		c[1].Sx("A005 OK.*")
 
+		s.flush("user")
+
 		c[2].C("B003 NOOP")
 		c[2].S(
 			`* 1 FETCH (FLAGS (\Deleted \Seen))`,
@@ -67,6 +69,8 @@ func TestClose(t *testing.T) {
 		c[1].C(`A202 CLOSE`)
 		c[1].S("A202 OK CLOSE")
 
+		s.flush("user")
+
 		c[2].C("B003 NOOP")
 		c[2].S(
 			`* 1 EXPUNGE`,

tests/multi_test.go

@@ -50,13 +50,15 @@ func TestExistsUpdatesInSeparateMailboxes(t *testing.T) {
 }
 
 func TestFetchUpdates(t *testing.T) {
-	runManyToOneTestWithAuth(t, defaultServerOptions(t), []int{1, 2}, func(c map[int]*testConnection, _ *testSession) {
+	runManyToOneTestWithAuth(t, defaultServerOptions(t), []int{1, 2}, func(c map[int]*testConnection, s *testSession) {
 		c[1].doAppend(`INBOX`, `To: [email protected]`, `\Seen`).expect("OK")
 
 		// First client selects in INBOX to receive FETCH update.
 		c[1].C("A006 select INBOX")
 		c[1].Se("A006 OK [READ-WRITE] SELECT")
 
+		s.flush("user")
+
 		// Second client selects in INBOX and then sets some flags to generate a FETCH update.
 		c[2].C("b006 select INBOX")
 		c[2].Se("b006 OK [READ-WRITE] SELECT")
@@ -65,6 +67,8 @@ func TestFetchUpdates(t *testing.T) {
 		c[2].S(`* 1 FETCH (FLAGS (\Deleted \Seen))`)
 		c[2].Sx("B007 OK .*")
 
+		s.flush("user")
+
 		// First client receives the FETCH update.
 		c[1].C("c001 noop")
 		c[1].S(`* 1 FETCH (FLAGS (\Deleted \Recent \Seen))`)