fix: golangci-lint checks

Signed-off-by: Clement <gh.2lgqz@aleeas.com>

tests/e2e/etcd_mix_versions_test.go

@@ -22,9 +22,9 @@ import (
 
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-	"go.etcd.io/etcd/server/v3/etcdserver"
 
 	"go.etcd.io/etcd/client/pkg/v3/fileutil"
+	"go.etcd.io/etcd/server/v3/etcdserver"
 	"go.etcd.io/etcd/tests/v3/framework/config"
 	"go.etcd.io/etcd/tests/v3/framework/e2e"
 )

tests/e2e/leader_snapshot_no_proxy_test.go

@@ -24,11 +24,11 @@ import (
 
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-	"go.etcd.io/etcd/server/v3/etcdserver"
 	"go.uber.org/zap"
 
 	clientv3 "go.etcd.io/etcd/client/v3"
 	"go.etcd.io/etcd/pkg/v3/expect"
+	"go.etcd.io/etcd/server/v3/etcdserver"
 	"go.etcd.io/etcd/tests/v3/framework/config"
 	"go.etcd.io/etcd/tests/v3/framework/e2e"
 	"go.etcd.io/etcd/tests/v3/robustness/failpoint"

tests/integration/v3_compact_raft_log_test.go

@@ -21,6 +21,7 @@ import (
 	"time"
 
 	"github.com/stretchr/testify/assert"
+
 	pb "go.etcd.io/etcd/api/v3/etcdserverpb"
 	"go.etcd.io/etcd/server/v3/etcdserver"
 	"go.etcd.io/etcd/tests/v3/framework/integration"
@@ -175,10 +176,10 @@ func expectMemberLogExactCount(t *testing.T, m *integration.Member, timeout time
 	// make sure at MOST `count` log entries contain `s`
 	lines, err := m.LogObserver.Expect(ctx2, s, count+1)
 	if err != nil {
-		if errors.Is(err, context.DeadlineExceeded) {
-			return
-		} else {
+		if !errors.Is(err, context.DeadlineExceeded) {
 			t.Fatalf("failed to expect (log:%s, count:%v): %v", s, count, err)
+		} else {
+			return
 		}
 	}