From 69c9e5ffb1772ee1f5415fed3daf5ce5a11807fa Mon Sep 17 00:00:00 2001
From: Yati Padia <ypadia@redhat.com>
Date: Sun, 11 Jul 2021 12:57:41 +0530
Subject: [PATCH] cleanup: resolve parallel test issue

This commit resolves parallel test issues
and also excludes internal/util/conn_pool_test.go
as those test can't run in parallel.

Updates: #1586

Signed-off-by: Yati Padia <ypadia@redhat.com>
---
 internal/rbd/controllerserver_test.go         |  1 +
 .../rbd/replicationcontrollerserver_test.go   | 31 ++++++++++---------
 internal/util/conn_pool_test.go               |  2 +-
 3 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/internal/rbd/controllerserver_test.go b/internal/rbd/controllerserver_test.go
index 509cadf42..072a65a70 100644
--- a/internal/rbd/controllerserver_test.go
+++ b/internal/rbd/controllerserver_test.go
@@ -23,6 +23,7 @@ import (
 )
 
 func TestIsThickProvisionRequest(t *testing.T) {
+	t.Parallel()
 	req := &csi.CreateVolumeRequest{
 		Name: "fake",
 		Parameters: map[string]string{
diff --git a/internal/rbd/replicationcontrollerserver_test.go b/internal/rbd/replicationcontrollerserver_test.go
index e5b2aada3..bdeb738e5 100644
--- a/internal/rbd/replicationcontrollerserver_test.go
+++ b/internal/rbd/replicationcontrollerserver_test.go
@@ -63,21 +63,23 @@ func TestValidateSchedulingInterval(t *testing.T) {
 		},
 	}
 	for _, tt := range tests {
-		st := tt
+		tt := tt
 		t.Run(tt.name, func(t *testing.T) {
-			got, err := validateSchedulingInterval(st.interval)
-			if (err != nil) != st.wantErr {
-				t.Errorf("validateSchedulingInterval() error = %v, wantErr %v", err, st.wantErr)
+			t.Parallel()
+			got, err := validateSchedulingInterval(tt.interval)
+			if (err != nil) != tt.wantErr {
+				t.Errorf("validateSchedulingInterval() error = %v, wantErr %v", err, tt.wantErr)
 				return
 			}
-			if !reflect.DeepEqual(got, st.want) {
-				t.Errorf("validateSchedulingInterval() = %v, want %v", got, st.want)
+			if !reflect.DeepEqual(got, tt.want) {
+				t.Errorf("validateSchedulingInterval() = %v, want %v", got, tt.want)
 			}
 		})
 	}
 }
 
 func TestGetSchedulingDetails(t *testing.T) {
+	t.Parallel()
 	tests := []struct {
 		name          string
 		parameters    map[string]string
@@ -137,18 +139,19 @@ func TestGetSchedulingDetails(t *testing.T) {
 		},
 	}
 	for _, tt := range tests {
-		st := tt
+		tt := tt
 		t.Run(tt.name, func(t *testing.T) {
-			interval, startTime, err := getSchedulingDetails(st.parameters)
-			if (err != nil) != st.wantErr {
-				t.Errorf("getSchedulingDetails() error = %v, wantErr %v", err, st.wantErr)
+			t.Parallel()
+			interval, startTime, err := getSchedulingDetails(tt.parameters)
+			if (err != nil) != tt.wantErr {
+				t.Errorf("getSchedulingDetails() error = %v, wantErr %v", err, tt.wantErr)
 				return
 			}
-			if !reflect.DeepEqual(interval, st.wantInterval) {
-				t.Errorf("getSchedulingDetails() interval = %v, want %v", interval, st.wantInterval)
+			if !reflect.DeepEqual(interval, tt.wantInterval) {
+				t.Errorf("getSchedulingDetails() interval = %v, want %v", interval, tt.wantInterval)
 			}
-			if !reflect.DeepEqual(startTime, st.wantStartTime) {
-				t.Errorf("getSchedulingDetails() startTime = %v, want %v", startTime, st.wantStartTime)
+			if !reflect.DeepEqual(startTime, tt.wantStartTime) {
+				t.Errorf("getSchedulingDetails() startTime = %v, want %v", startTime, tt.wantStartTime)
 			}
 		})
 	}
diff --git a/internal/util/conn_pool_test.go b/internal/util/conn_pool_test.go
index 7377ed95d..7e73cffcf 100644
--- a/internal/util/conn_pool_test.go
+++ b/internal/util/conn_pool_test.go
@@ -73,8 +73,8 @@ func (cp *ConnPool) fakeGet(monitors, user, keyfile string) (*rados.Conn, string
 	return conn, unique, nil
 }
 
+// nolint:paralleltest,tparallel
 func TestConnPool(t *testing.T) {
-	t.Parallel()
 	cp := NewConnPool(interval, expiry)
 	defer cp.Destroy()