Merge branch 'main' into readeable-error

zeripath · web-flow · commit 49539d2ab2cc · 2021-11-22T07:57:20.000Z
diff --git a/integrations/api_repo_test.go b/integrations/api_repo_test.go
@@ -334,7 +334,7 @@ func TestAPIRepoMigrate(t *testing.T) {
 			case "You can not import from disallowed hosts.":
 				assert.EqualValues(t, "private-ip", testCase.repoName)
 			default:
-				assert.Fail(t, "unexpected error '%v' on url '%s'", respJSON["message"], testCase.cloneURL)
+				assert.Failf(t, "unexpected error '%v' on url '%s'", respJSON["message"], testCase.cloneURL)
 			}
 		} else {
 			assert.EqualValues(t, testCase.expectedStatus, resp.Code)

Original file line number	Diff line number	Diff line change
`@@ -334,7 +334,7 @@ func TestAPIRepoMigrate(t *testing.T) {`
`334`	`334`	`case "You can not import from disallowed hosts.":`
`335`	`335`	`assert.EqualValues(t, "private-ip", testCase.repoName)`
`336`	`336`	`default:`
`337`		`- assert.Fail(t, "unexpected error '%v' on url '%s'", respJSON["message"], testCase.cloneURL)`
	`337`	`+ assert.Failf(t, "unexpected error '%v' on url '%s'", respJSON["message"], testCase.cloneURL)`
`338`	`338`	`}`
`339`	`339`	`} else {`
`340`	`340`	`assert.EqualValues(t, testCase.expectedStatus, resp.Code)`