Changed require.Nil to require.NoError when error type is used (#16900)

services/imageproxy/atmos_camo_test.go

@@ -80,7 +80,7 @@ func TestAtmosCamoBackend_GetImageDirect(t *testing.T) {
 
 	body, contentType, err := backend.GetImageDirect("https://example.com/image.png")
 
-	assert.Nil(t, err)
+	assert.NoError(t, err)
 	assert.Equal(t, "image/png", contentType)
 
 	require.NotNil(t, body)

services/imageproxy/local_test.go

@@ -213,7 +213,7 @@ func TestLocalBackend_GetImageDirect(t *testing.T) {
 
 		body, contentType, err := proxy.GetImageDirect(mock.URL + "/image.png")
 
-		assert.Nil(t, err)
+		assert.NoError(t, err)
 		assert.Equal(t, "image/png", contentType)
 
 		respBody, _ := ioutil.ReadAll(body)
@@ -232,7 +232,7 @@ func TestLocalBackend_GetImageDirect(t *testing.T) {
 
 		body, contentType, err := proxy.GetImageDirect(mock.URL + "/file.pdf")
 
-		assert.NotNil(t, err)
+		assert.Error(t, err)
 		assert.Equal(t, "", contentType)
 		assert.Equal(t, ErrLocalRequestFailed, err)
 		assert.Nil(t, body)
@@ -255,7 +255,7 @@ func TestLocalBackend_GetImageDirect(t *testing.T) {
 
 		body, contentType, err := proxy.GetImageDirect(mock.URL + "/file.pdf")
 
-		assert.NotNil(t, err)
+		assert.Error(t, err)
 		assert.Equal(t, "", contentType)
 		assert.Equal(t, ErrLocalRequestFailed, err)
 		assert.Nil(t, body)
@@ -273,7 +273,7 @@ func TestLocalBackend_GetImageDirect(t *testing.T) {
 
 		body, contentType, err := proxy.GetImageDirect(mock.URL + "/image.png")
 
-		assert.NotNil(t, err)
+		assert.Error(t, err)
 		assert.Equal(t, "", contentType)
 		assert.Equal(t, ErrLocalRequestFailed, err)
 		assert.Nil(t, body)
@@ -291,7 +291,7 @@ func TestLocalBackend_GetImageDirect(t *testing.T) {
 
 		body, contentType, err := proxy.GetImageDirect(mock.URL + "/image.png")
 
-		assert.NotNil(t, err)
+		assert.Error(t, err)
 		assert.Equal(t, "", contentType)
 		assert.Equal(t, ErrLocalRequestFailed, err)
 		assert.Nil(t, body)
@@ -314,7 +314,7 @@ func TestLocalBackend_GetImageDirect(t *testing.T) {
 
 		body, contentType, err := proxy.GetImageDirect(mock.URL + "/image.png")
 
-		assert.NotNil(t, err)
+		assert.Error(t, err)
 		assert.Equal(t, "", contentType)
 		assert.Equal(t, ErrLocalRequestFailed, err)
 		assert.Nil(t, body)