From 3a3f43f72f4f8be8233d5ddce38dfd8b0667b0c0 Mon Sep 17 00:00:00 2001
From: Maksym Pavlenko <pavlenko.maksym@gmail.com>
Date: Fri, 15 Jul 2022 13:29:04 -0700
Subject: [PATCH] Fix linter warnings

Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com>
---
 pkg/cri/store/container/status_test.go | 15 +++++----------
 pkg/cri/store/sandbox/status_test.go   |  6 ++----
 2 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/pkg/cri/store/container/status_test.go b/pkg/cri/store/container/status_test.go
index d4b2542bf..29d892f79 100644
--- a/pkg/cri/store/container/status_test.go
+++ b/pkg/cri/store/container/status_test.go
@@ -131,8 +131,7 @@ func TestStatus(t *testing.T) {
 
 	t.Logf("failed update should not take effect")
 	err = s.Update(func(o Status) (Status, error) {
-		o = updateStatus
-		return o, updateErr
+		return updateStatus, updateErr
 	})
 	assert.Equal(updateErr, err)
 	assert.Equal(testStatus, s.Get())
@@ -142,8 +141,7 @@ func TestStatus(t *testing.T) {
 
 	t.Logf("successful update should take effect but not checkpoint")
 	err = s.Update(func(o Status) (Status, error) {
-		o = updateStatus
-		return o, nil
+		return updateStatus, nil
 	})
 	assert.NoError(err)
 	assert.Equal(updateStatus, s.Get())
@@ -152,14 +150,12 @@ func TestStatus(t *testing.T) {
 	assert.Equal(testStatus, loaded)
 	// Recover status.
 	assert.NoError(s.Update(func(o Status) (Status, error) {
-		o = testStatus
-		return o, nil
+		return testStatus, nil
 	}))
 
 	t.Logf("failed update sync should not take effect")
 	err = s.UpdateSync(func(o Status) (Status, error) {
-		o = updateStatus
-		return o, updateErr
+		return updateStatus, updateErr
 	})
 	assert.Equal(updateErr, err)
 	assert.Equal(testStatus, s.Get())
@@ -169,8 +165,7 @@ func TestStatus(t *testing.T) {
 
 	t.Logf("successful update sync should take effect and checkpoint")
 	err = s.UpdateSync(func(o Status) (Status, error) {
-		o = updateStatus
-		return o, nil
+		return updateStatus, nil
 	})
 	assert.NoError(err)
 	assert.Equal(updateStatus, s.Get())
diff --git a/pkg/cri/store/sandbox/status_test.go b/pkg/cri/store/sandbox/status_test.go
index ad27db0c6..fc74629b0 100644
--- a/pkg/cri/store/sandbox/status_test.go
+++ b/pkg/cri/store/sandbox/status_test.go
@@ -45,16 +45,14 @@ func TestStatus(t *testing.T) {
 
 	t.Logf("failed update should not take effect")
 	err := s.Update(func(o Status) (Status, error) {
-		o = updateStatus
-		return o, updateErr
+		return updateStatus, updateErr
 	})
 	assert.Equal(updateErr, err)
 	assert.Equal(testStatus, s.Get())
 
 	t.Logf("successful update should take effect but not checkpoint")
 	err = s.Update(func(o Status) (Status, error) {
-		o = updateStatus
-		return o, nil
+		return updateStatus, nil
 	})
 	assert.NoError(err)
 	assert.Equal(updateStatus, s.Get())