Replace assert.Fail with assert.FailNow (#27578)

assert.Fail() will continue to execute the code while assert.FailNow()
not. I thought those uses of assert.Fail() should exit immediately.
PS: perhaps it's a good idea to use
[require](https://pkg.go.dev/github.com/stretchr/testify/require)
somewhere because the assert package's default behavior does not exit
when an error occurs, which makes it difficult to find the root error
reason.

6 files changed, 5 insertions, 15 deletions

diff --git a/tests/integration/api_packages_conan_test.go b/tests/integration/api_packages_conan_test.go
index 1f7890f3c0..ab128bf4a5 100644
--- a/tests/integration/api_packages_conan_test.go
+++ b/tests/integration/api_packages_conan_test.go
@@ -296,7 +296,7 @@ func TestPackageConan(t *testing.T) {
 
 						assert.Equal(t, int64(len(contentConaninfo)), pb.Size)
 					} else {
-						assert.Fail(t, "unknown file: %s", pf.Name)
+						assert.FailNow(t, "unknown file: %s", pf.Name)
 					}
 				}
 			})
diff --git a/tests/integration/api_packages_container_test.go b/tests/integration/api_packages_container_test.go
index 01002a4413..93b4ff4624 100644
--- a/tests/integration/api_packages_container_test.go
+++ b/tests/integration/api_packages_container_test.go
@@ -349,7 +349,7 @@ func TestPackageContainer(t *testing.T) {
 								assert.Equal(t, "application/vnd.docker.image.rootfs.diff.tar.gzip", pfd.Properties.GetByName(container_module.PropertyMediaType))
 								assert.Equal(t, blobDigest, pfd.Properties.GetByName(container_module.PropertyDigest))
 							default:
-								assert.Fail(t, "unknown file: %s", pfd.File.Name)
+								assert.FailNow(t, "unknown file: %s", pfd.File.Name)
 							}
 						}
 
diff --git a/tests/integration/api_packages_nuget_test.go b/tests/integration/api_packages_nuget_test.go
index 520d1dd0a7..04c2fbce0e 100644
--- a/tests/integration/api_packages_nuget_test.go
+++ b/tests/integration/api_packages_nuget_test.go
@@ -326,7 +326,7 @@ AAAjQmxvYgAAAGm7ENm9SGxMtAFVvPUsPJTF6PbtAAAAAFcVogEJAAAAAQAAAA==`)
 					assert.Equal(t, nuget_module.PropertySymbolID, pps[0].Name)
 					assert.Equal(t, symbolID, pps[0].Value)
 				default:
-					assert.Fail(t, "unexpected file: %v", pf.Name)
+					assert.FailNow(t, "unexpected file: %v", pf.Name)
 				}
 			}
 
diff --git a/tests/integration/api_repo_test.go b/tests/integration/api_repo_test.go
index a6d32a89ea..d1d6696164 100644
--- a/tests/integration/api_repo_test.go
+++ b/tests/integration/api_repo_test.go
@@ -368,7 +368,7 @@ func TestAPIRepoMigrate(t *testing.T) {
 			case "You can not import from disallowed hosts.":
 				assert.EqualValues(t, "private-ip", testCase.repoName)
 			default:
-				assert.Failf(t, "unexpected error '%v' on url '%s'", respJSON["message"], testCase.cloneURL)
+				assert.FailNow(t, "unexpected error '%v' on url '%s'", respJSON["message"], testCase.cloneURL)
 			}
 		} else {
 			assert.EqualValues(t, testCase.expectedStatus, resp.Code)
diff --git a/tests/integration/api_token_test.go b/tests/integration/api_token_test.go
index a713922982..fe0e44d97f 100644
--- a/tests/integration/api_token_test.go
+++ b/tests/integration/api_token_test.go
@@ -483,8 +483,7 @@ func runTestCase(t *testing.T, testCase *requiredScopeTestCase, user *user_model
 				} else if minRequiredLevel == auth_model.Write {
 					unauthorizedLevel = auth_model.Read
 				} else {
-					assert.Failf(t, "Invalid test case", "Unknown access token scope level: %v", minRequiredLevel)
-					return
+					assert.FailNow(t, "Invalid test case: Unknown access token scope level: %v", minRequiredLevel)
 				}
 			}
 
diff --git a/tests/integration/gpg_git_test.go b/tests/integration/gpg_git_test.go
index 6d67bec09b..00890cfb38 100644
--- a/tests/integration/gpg_git_test.go
+++ b/tests/integration/gpg_git_test.go
@@ -106,12 +106,10 @@ func TestGPGGit(t *testing.T) {
 					assert.NotNil(t, response.Verification)
 					if response.Verification == nil {
 						assert.FailNow(t, "no verification provided with response! %v", response)
-						return
 					}
 					assert.True(t, response.Verification.Verified)
 					if !response.Verification.Verified {
 						t.FailNow()
-						return
 					}
 					assert.Equal(t, "gitea@fake.local", response.Verification.Signer.Email)
 				}))
@@ -120,12 +118,10 @@ func TestGPGGit(t *testing.T) {
 					assert.NotNil(t, response.Verification)
 					if response.Verification == nil {
 						assert.FailNow(t, "no verification provided with response! %v", response)
-						return
 					}
 					assert.True(t, response.Verification.Verified)
 					if !response.Verification.Verified {
 						t.FailNow()
-						return
 					}
 					assert.Equal(t, "gitea@fake.local", response.Verification.Signer.Email)
 				}))
@@ -140,12 +136,10 @@ func TestGPGGit(t *testing.T) {
 					assert.NotNil(t, response.Verification)
 					if response.Verification == nil {
 						assert.FailNow(t, "no verification provided with response! %v", response)
-						return
 					}
 					assert.True(t, response.Verification.Verified)
 					if !response.Verification.Verified {
 						t.FailNow()
-						return
 					}
 					assert.Equal(t, "gitea@fake.local", response.Verification.Signer.Email)
 				}))
@@ -160,17 +154,14 @@ func TestGPGGit(t *testing.T) {
 				assert.NotNil(t, branch.Commit)
 				if branch.Commit == nil {
 					assert.FailNow(t, "no commit provided with branch! %v", branch)
-					return
 				}
 				assert.NotNil(t, branch.Commit.Verification)
 				if branch.Commit.Verification == nil {
 					assert.FailNow(t, "no verification provided with branch commit! %v", branch.Commit)
-					return
 				}
 				assert.True(t, branch.Commit.Verification.Verified)
 				if !branch.Commit.Verification.Verified {
 					t.FailNow()
-					return
 				}
 				assert.Equal(t, "gitea@fake.local", branch.Commit.Verification.Signer.Email)
 			}))