cluster_test.go - resolve conflicts

dell · Jan 28, 2025 · 9618d1d · 9618d1d
1 parent 147ec7e
commit 9618d1d
Showing 1 changed file with 0 additions and 12 deletions.
diff --git a/cluster_test.go b/cluster_test.go
@@ -31,20 +31,12 @@ func TestGetStatistics(t *testing.T) {
 	client.API.(*mocks.Client).On("VolumesPath", anyArgs...).Return("/ifs/data").Once()
 	client.API.(*mocks.Client).On("Get", anyArgs...).Return(nil).Run(func(args mock.Arguments) {
 		resp := args.Get(5).(**apiv3.IsiStatsResp)
-<<<<<<< HEAD
-		*resp = &apiv3.IsiStatsResp{
-			StatsList: []*apiv3.IsiStats{
-				{
-					Key: "ifs.bytes.avail",
-				},
-=======
 		stats := &apiv3.IsiStats{
 			Key: "ifs.bytes.avail",
 		}
 		*resp = &apiv3.IsiStatsResp{
 			StatsList: []*apiv3.IsiStats{
 				stats,
->>>>>>> 3f414a3d2f45df7529b27daa42ea64443736ebe1
 			},
 		}
 	}).Once()
@@ -84,11 +76,7 @@ func TestGetFloatStatistics(t *testing.T) {
 
 func TestIsIOInProgress(t *testing.T) {
 	client.API.(*mocks.Client).ExpectedCalls = nil
-<<<<<<< HEAD
-	client.API.(*mocks.Client).On("VolumesPath", anyArgs...).Return("").Once()
-=======
 	client.API.(*mocks.Client).On("VolumesPath", anyArgs...).Return("/ifs/data").Once()
->>>>>>> 3f414a3d2f45df7529b27daa42ea64443736ebe1
 	client.API.(*mocks.Client).On("Get", anyArgs...).Return(nil).Run(func(args mock.Arguments) {
 		resp := args.Get(5).(**apiv3.ExportClientList)
 		*resp = &apiv3.ExportClientList{}