diff --git a/Makefile b/Makefile
index fd0555fb8619d3539e9f2c68dcee5a448953514c..5945a4e67a7610c521579d22cb316bdb103a0e5b 100644
--- a/Makefile
+++ b/Makefile
@@ -112,7 +112,7 @@ testdata/scratch:
mkdir -p testdata/scratch
.PHONY: verify
-verify: lint vet detect-context check-formatting staticcheck
+verify: lint vet detect-context detect-assert check-formatting staticcheck
.PHONY: lint
lint: $(TARGET_SETUP)
@@ -130,6 +130,11 @@ detect-context: $(TARGET_SETUP)
$(call message,Verify: $@)
_support/detect-context.sh
+.PHONY: detect-assert
+detect-assert:
+ $(call message,Verify: $@)
+ _support/detect-assert.sh
+
.PHONY: check-formatting
check-formatting: $(TARGET_SETUP) install-goimports
$(call message,Verify: $@)
diff --git a/_support/detect-assert.sh b/_support/detect-assert.sh
new file mode 100755
index 0000000000000000000000000000000000000000..351cef763b5e34aa041a88c2c2dc29d3432d5cf6
--- /dev/null
+++ b/_support/detect-assert.sh
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+git grep 'testify/assert"' | \
+ grep -e '^[^:]*\.go' | \
+ awk '{
+ print "error: please use testify/require instead of testify/assert"
+ print
+ exit 1
+}'
diff --git a/gitaly_integration_test.go b/gitaly_integration_test.go
index 4455ad4fc800572608d14c62ac97a9e84cc81208..1aa73c851aed13b41a1725b91fc4bae70652913d 100644
--- a/gitaly_integration_test.go
+++ b/gitaly_integration_test.go
@@ -16,7 +16,6 @@ import (
"strings"
"testing"
- "github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"gitlab.com/gitlab-org/gitaly/proto/go/gitalypb"
@@ -178,10 +177,10 @@ func TestAllowedGetGitBlob(t *testing.T) {
require.NoError(t, err)
shortBody := string(body[:len(expectedBody)])
- assert.Equal(t, 200, resp.StatusCode, "GET %q: status code", resp.Request.URL)
- assert.Equal(t, expectedBody, shortBody, "GET %q: response body", resp.Request.URL)
+ require.Equal(t, 200, resp.StatusCode, "GET %q: status code", resp.Request.URL)
+ require.Equal(t, expectedBody, shortBody, "GET %q: response body", resp.Request.URL)
testhelper.RequireResponseHeader(t, resp, "Content-Length", strconv.Itoa(bodyLen))
- assertNginxResponseBuffering(t, "no", resp, "GET %q: nginx response buffering", resp.Request.URL)
+ requireNginxResponseBuffering(t, "no", resp, "GET %q: nginx response buffering", resp.Request.URL)
}
func TestAllowedGetGitArchive(t *testing.T) {
@@ -205,8 +204,8 @@ func TestAllowedGetGitArchive(t *testing.T) {
resp, body, err := doSendDataRequest("/archive.tar", "git-archive", jsonParams)
require.NoError(t, err)
- assert.Equal(t, 200, resp.StatusCode, "GET %q: status code", resp.Request.URL)
- assertNginxResponseBuffering(t, "no", resp, "GET %q: nginx response buffering", resp.Request.URL)
+ require.Equal(t, 200, resp.StatusCode, "GET %q: status code", resp.Request.URL)
+ requireNginxResponseBuffering(t, "no", resp, "GET %q: nginx response buffering", resp.Request.URL)
// Ensure the tar file is readable
foundEntry := false
@@ -223,7 +222,7 @@ func TestAllowedGetGitArchive(t *testing.T) {
}
}
- assert.True(t, foundEntry, "Couldn't find %v directory entry", archivePrefix)
+ require.True(t, foundEntry, "Couldn't find %v directory entry", archivePrefix)
}
func TestAllowedGetGitArchiveOldPayload(t *testing.T) {
@@ -250,8 +249,8 @@ func TestAllowedGetGitArchiveOldPayload(t *testing.T) {
resp, body, err := doSendDataRequest("/archive.tar", "git-archive", jsonParams)
require.NoError(t, err)
- assert.Equal(t, 200, resp.StatusCode, "GET %q: status code", resp.Request.URL)
- assertNginxResponseBuffering(t, "no", resp, "GET %q: nginx response buffering", resp.Request.URL)
+ require.Equal(t, 200, resp.StatusCode, "GET %q: status code", resp.Request.URL)
+ requireNginxResponseBuffering(t, "no", resp, "GET %q: nginx response buffering", resp.Request.URL)
// Ensure the tar file is readable
foundEntry := false
@@ -268,7 +267,7 @@ func TestAllowedGetGitArchiveOldPayload(t *testing.T) {
}
}
- assert.True(t, foundEntry, "Couldn't find %v directory entry", archivePrefix)
+ require.True(t, foundEntry, "Couldn't find %v directory entry", archivePrefix)
}
func TestAllowedGetGitDiff(t *testing.T) {
@@ -293,9 +292,9 @@ func TestAllowedGetGitDiff(t *testing.T) {
require.NoError(t, err)
shortBody := string(body[:len(expectedBody)])
- assert.Equal(t, 200, resp.StatusCode, "GET %q: status code", resp.Request.URL)
- assert.Equal(t, expectedBody, shortBody, "GET %q: response body", resp.Request.URL)
- assertNginxResponseBuffering(t, "no", resp, "GET %q: nginx response buffering", resp.Request.URL)
+ require.Equal(t, 200, resp.StatusCode, "GET %q: status code", resp.Request.URL)
+ require.Equal(t, expectedBody, shortBody, "GET %q: response body", resp.Request.URL)
+ requireNginxResponseBuffering(t, "no", resp, "GET %q: nginx response buffering", resp.Request.URL)
}
func TestAllowedGetGitFormatPatch(t *testing.T) {
@@ -317,8 +316,8 @@ func TestAllowedGetGitFormatPatch(t *testing.T) {
resp, body, err := doSendDataRequest("/something", "git-format-patch", jsonParams)
require.NoError(t, err)
- assert.Equal(t, 200, resp.StatusCode, "GET %q: status code", resp.Request.URL)
- assertNginxResponseBuffering(t, "no", resp, "GET %q: nginx response buffering", resp.Request.URL)
+ require.Equal(t, 200, resp.StatusCode, "GET %q: status code", resp.Request.URL)
+ requireNginxResponseBuffering(t, "no", resp, "GET %q: nginx response buffering", resp.Request.URL)
requirePatchSeries(
t,
diff --git a/gitaly_test.go b/gitaly_test.go
index 07813d6dc30f3b944816b886e0c5831b2f7d11bd..d571e697ff0c6db53999d003787ae01b5c6264a7 100644
--- a/gitaly_test.go
+++ b/gitaly_test.go
@@ -19,7 +19,6 @@ import (
"github.com/golang/protobuf/jsonpb" //lint:ignore SA1019 https://gitlab.com/gitlab-org/gitlab-workhorse/-/issues/274
"github.com/golang/protobuf/proto" //lint:ignore SA1019 https://gitlab.com/gitlab-org/gitlab-workhorse/-/issues/274
- "github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"google.golang.org/grpc"
"google.golang.org/grpc/codes"
@@ -53,7 +52,7 @@ func TestFailedCloneNoGitaly(t *testing.T) {
cloneCmd := exec.Command("git", "clone", fmt.Sprintf("%s/%s", ws.URL, testRepo), checkoutDir)
out, err := cloneCmd.CombinedOutput()
t.Log(string(out))
- assert.Error(t, err, "git clone should have failed")
+ require.Error(t, err, "git clone should have failed")
}
func TestGetInfoRefsProxiedToGitalySuccessfully(t *testing.T) {
@@ -214,14 +213,14 @@ func TestPostReceivePackProxiedToGitalySuccessfully(t *testing.T) {
gitalyRequest := &gitalypb.PostReceivePackRequest{}
require.NoError(t, jsonpb.UnmarshalString(split[0], gitalyRequest))
- assert.Equal(t, apiResponse.Repository.StorageName, gitalyRequest.Repository.StorageName)
- assert.Equal(t, apiResponse.Repository.RelativePath, gitalyRequest.Repository.RelativePath)
- assert.Equal(t, apiResponse.GL_ID, gitalyRequest.GlId)
- assert.Equal(t, apiResponse.GL_USERNAME, gitalyRequest.GlUsername)
- assert.Equal(t, apiResponse.GitConfigOptions, gitalyRequest.GitConfigOptions)
- assert.Equal(t, gitProtocol, gitalyRequest.GitProtocol)
+ require.Equal(t, apiResponse.Repository.StorageName, gitalyRequest.Repository.StorageName)
+ require.Equal(t, apiResponse.Repository.RelativePath, gitalyRequest.Repository.RelativePath)
+ require.Equal(t, apiResponse.GL_ID, gitalyRequest.GlId)
+ require.Equal(t, apiResponse.GL_USERNAME, gitalyRequest.GlUsername)
+ require.Equal(t, apiResponse.GitConfigOptions, gitalyRequest.GitConfigOptions)
+ require.Equal(t, gitProtocol, gitalyRequest.GitProtocol)
- assert.Equal(t, 200, resp.StatusCode, "POST %q", resource)
+ require.Equal(t, 200, resp.StatusCode, "POST %q", resource)
require.Equal(t, string(testhelper.GitalyReceivePackResponseMock), split[1])
testhelper.RequireResponseHeader(t, resp, "Content-Type", "application/x-git-receive-pack-result")
}
@@ -246,7 +245,7 @@ func TestPostReceivePackProxiedToGitalyInterrupted(t *testing.T) {
bytes.NewReader(testhelper.GitalyReceivePackResponseMock),
)
require.NoError(t, err)
- assert.Equal(t, 200, resp.StatusCode, "POST %q", resource)
+ require.Equal(t, 200, resp.StatusCode, "POST %q", resource)
// This causes the server stream to be interrupted instead of consumed entirely.
resp.Body.Close()
@@ -363,7 +362,7 @@ func TestPostUploadPackProxiedToGitalyInterrupted(t *testing.T) {
bytes.NewReader(testhelper.GitalyUploadPackResponseMock),
)
require.NoError(t, err)
- assert.Equal(t, 200, resp.StatusCode, "POST %q", resource)
+ require.Equal(t, 200, resp.StatusCode, "POST %q", resource)
// This causes the server stream to be interrupted instead of consumed entirely.
resp.Body.Close()
@@ -393,8 +392,8 @@ func TestGetDiffProxiedToGitalySuccessfully(t *testing.T) {
resp, body, err := doSendDataRequest("/something", "git-diff", jsonParams)
require.NoError(t, err)
- assert.Equal(t, 200, resp.StatusCode, "GET %q: status code", resp.Request.URL)
- assert.Equal(t, expectedBody, string(body), "GET %q: response body", resp.Request.URL)
+ require.Equal(t, 200, resp.StatusCode, "GET %q: status code", resp.Request.URL)
+ require.Equal(t, expectedBody, string(body), "GET %q: response body", resp.Request.URL)
}
func TestGetPatchProxiedToGitalySuccessfully(t *testing.T) {
@@ -413,8 +412,8 @@ func TestGetPatchProxiedToGitalySuccessfully(t *testing.T) {
resp, body, err := doSendDataRequest("/something", "git-format-patch", jsonParams)
require.NoError(t, err)
- assert.Equal(t, 200, resp.StatusCode, "GET %q: status code", resp.Request.URL)
- assert.Equal(t, expectedBody, string(body), "GET %q: response body", resp.Request.URL)
+ require.Equal(t, 200, resp.StatusCode, "GET %q: status code", resp.Request.URL)
+ require.Equal(t, expectedBody, string(body), "GET %q: response body", resp.Request.URL)
}
func TestGetBlobProxiedToGitalyInterruptedStream(t *testing.T) {
@@ -469,9 +468,9 @@ func TestGetArchiveProxiedToGitalySuccessfully(t *testing.T) {
resp, body, err := doSendDataRequest("/archive.tar.gz", "git-archive", jsonParams)
require.NoError(t, err)
- assert.Equal(t, 200, resp.StatusCode, "GET %q: status code", resp.Request.URL)
- assert.Equal(t, expectedBody, string(body), "GET %q: response body", resp.Request.URL)
- assert.Equal(t, archiveLength, len(body), "GET %q: body size", resp.Request.URL)
+ require.Equal(t, 200, resp.StatusCode, "GET %q: status code", resp.Request.URL)
+ require.Equal(t, expectedBody, string(body), "GET %q: response body", resp.Request.URL)
+ require.Equal(t, archiveLength, len(body), "GET %q: body size", resp.Request.URL)
if tc.cacheDisabled {
_, err := os.Stat(tc.archivePath)
@@ -578,9 +577,9 @@ func TestGetSnapshotProxiedToGitalySuccessfully(t *testing.T) {
resp, body, err := doSendDataRequest("/api/v4/projects/:id/snapshot", "git-snapshot", params)
require.NoError(t, err)
- assert.Equal(t, http.StatusOK, resp.StatusCode, "GET %q: status code", resp.Request.URL)
- assert.Equal(t, expectedBody, string(body), "GET %q: body", resp.Request.URL)
- assert.Equal(t, archiveLength, len(body), "GET %q: body size", resp.Request.URL)
+ require.Equal(t, http.StatusOK, resp.StatusCode, "GET %q: status code", resp.Request.URL)
+ require.Equal(t, expectedBody, string(body), "GET %q: body", resp.Request.URL)
+ require.Equal(t, archiveLength, len(body), "GET %q: body size", resp.Request.URL)
testhelper.RequireResponseHeader(t, resp, "Content-Disposition", `attachment; filename="snapshot.tar"`)
testhelper.RequireResponseHeader(t, resp, "Content-Type", "application/x-tar")
diff --git a/jobs_test.go b/jobs_test.go
index 1637d3010a7e332b85e24cb0fad7a48bdddb0757..fe51fc58d6ab1705c04b5b4c553317854757a832 100644
--- a/jobs_test.go
+++ b/jobs_test.go
@@ -7,7 +7,7 @@ import (
"testing"
"time"
- "github.com/stretchr/testify/assert"
+ "github.com/stretchr/testify/require"
)
func startWorkhorseServerWithLongPolling(authBackend string, pollingDuration time.Duration) *httptest.Server {
@@ -33,7 +33,7 @@ func testJobsLongPolling(t *testing.T, pollingDuration time.Duration, requestJob
defer ws.Close()
resp, err := requestJob(ws.URL, nil)
- assert.NoError(t, err)
+ require.NoError(t, err)
defer resp.Body.Close()
return resp
@@ -41,12 +41,12 @@ func testJobsLongPolling(t *testing.T, pollingDuration time.Duration, requestJob
func testJobsLongPollingEndpointDisabled(t *testing.T, requestJob requestJobFunction) {
resp := testJobsLongPolling(t, 0, requestJob)
- assert.NotEqual(t, "yes", resp.Header.Get("Gitlab-Ci-Builds-Polling"))
+ require.NotEqual(t, "yes", resp.Header.Get("Gitlab-Ci-Builds-Polling"))
}
func testJobsLongPollingEndpoint(t *testing.T, requestJob requestJobFunction) {
resp := testJobsLongPolling(t, time.Minute, requestJob)
- assert.Equal(t, "yes", resp.Header.Get("Gitlab-Ci-Builds-Polling"))
+ require.Equal(t, "yes", resp.Header.Get("Gitlab-Ci-Builds-Polling"))
}
func TestJobsLongPollingEndpointDisabled(t *testing.T) {
diff --git a/main_test.go b/main_test.go
index f98e3fec1de741ad5c6955f086ef2d925f2ea721..a5c0a8aac42785ce4e6e9864d236e2925efbed89 100644
--- a/main_test.go
+++ b/main_test.go
@@ -22,7 +22,6 @@ import (
"time"
"github.com/sirupsen/logrus"
- "github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"gitlab.com/gitlab-org/gitaly/proto/go/gitalypb"
"gitlab.com/gitlab-org/labkit/log"
@@ -73,7 +72,7 @@ func TestDeniedClone(t *testing.T) {
cloneCmd := exec.Command("git", "clone", fmt.Sprintf("%s/%s", ws.URL, testRepo), checkoutDir)
out, err := cloneCmd.CombinedOutput()
t.Log(string(out))
- assert.Error(t, err, "git clone should have failed")
+ require.Error(t, err, "git clone should have failed")
}
func TestDeniedPush(t *testing.T) {
@@ -88,7 +87,7 @@ func TestDeniedPush(t *testing.T) {
pushCmd.Dir = checkoutDir
out, err := pushCmd.CombinedOutput()
t.Log(string(out))
- assert.Error(t, err, "git push should have failed")
+ require.Error(t, err, "git push should have failed")
}
func TestRegularProjectsAPI(t *testing.T) {
@@ -113,9 +112,9 @@ func TestRegularProjectsAPI(t *testing.T) {
} {
resp, body := httpGet(t, ws.URL+resource, nil)
- assert.Equal(t, 200, resp.StatusCode, "GET %q: status code", resource)
- assert.Equal(t, apiResponse, body, "GET %q: response body", resource)
- assertNginxResponseBuffering(t, "", resp, "GET %q: nginx response buffering", resource)
+ require.Equal(t, 200, resp.StatusCode, "GET %q: status code", resource)
+ require.Equal(t, apiResponse, body, "GET %q: response body", resource)
+ requireNginxResponseBuffering(t, "", resp, "GET %q: nginx response buffering", resource)
}
}
@@ -152,10 +151,10 @@ func TestAllowedStaticFile(t *testing.T) {
} {
resp, body := httpGet(t, ws.URL+resource, nil)
- assert.Equal(t, 200, resp.StatusCode, "GET %q: status code", resource)
- assert.Equal(t, content, body, "GET %q: response body", resource)
- assertNginxResponseBuffering(t, "no", resp, "GET %q: nginx response buffering", resource)
- assert.False(t, proxied, "GET %q: should not have made it to backend", resource)
+ require.Equal(t, 200, resp.StatusCode, "GET %q: status code", resource)
+ require.Equal(t, content, body, "GET %q: response body", resource)
+ requireNginxResponseBuffering(t, "no", resp, "GET %q: nginx response buffering", resource)
+ require.False(t, proxied, "GET %q: should not have made it to backend", resource)
}
}
@@ -173,8 +172,8 @@ func TestStaticFileRelativeURL(t *testing.T) {
resource := "/my-relative-url/static.txt"
resp, body := httpGet(t, ws.URL+resource, nil)
- assert.Equal(t, 200, resp.StatusCode, "GET %q: status code", resource)
- assert.Equal(t, content, body, "GET %q: response body", resource)
+ require.Equal(t, 200, resp.StatusCode, "GET %q: status code", resource)
+ require.Equal(t, content, body, "GET %q: response body", resource)
}
func TestAllowedPublicUploadsFile(t *testing.T) {
@@ -197,9 +196,9 @@ func TestAllowedPublicUploadsFile(t *testing.T) {
} {
resp, body := httpGet(t, ws.URL+resource, nil)
- assert.Equal(t, 200, resp.StatusCode, "GET %q: status code", resource)
- assert.Equal(t, content, body, "GET %q: response body", resource)
- assert.True(t, proxied, "GET %q: never made it to backend", resource)
+ require.Equal(t, 200, resp.StatusCode, "GET %q: status code", resource)
+ require.Equal(t, content, body, "GET %q: response body", resource)
+ require.True(t, proxied, "GET %q: never made it to backend", resource)
}
}
@@ -222,9 +221,9 @@ func TestDeniedPublicUploadsFile(t *testing.T) {
} {
resp, body := httpGet(t, ws.URL+resource, nil)
- assert.Equal(t, 404, resp.StatusCode, "GET %q: status code", resource)
- assert.Equal(t, "", body, "GET %q: response body", resource)
- assert.True(t, proxied, "GET %q: never made it to backend", resource)
+ require.Equal(t, 404, resp.StatusCode, "GET %q: status code", resource)
+ require.Equal(t, "", body, "GET %q: response body", resource)
+ require.True(t, proxied, "GET %q: never made it to backend", resource)
}
}
@@ -253,8 +252,8 @@ This is a static error page for code 499
resourcePath := "/error-499"
resp, body := httpGet(t, ws.URL+resourcePath, nil)
- assert.Equal(t, 499, resp.StatusCode, "GET %q: status code", resourcePath)
- assert.Equal(t, string(errorPageBody), body, "GET %q: response body", resourcePath)
+ require.Equal(t, 499, resp.StatusCode, "GET %q: status code", resourcePath)
+ require.Equal(t, string(errorPageBody), body, "GET %q: response body", resourcePath)
}
func TestGzipAssets(t *testing.T) {
@@ -303,10 +302,10 @@ func TestGzipAssets(t *testing.T) {
b, err := ioutil.ReadAll(resp.Body)
require.NoError(t, err, desc)
- assert.Equal(t, 200, resp.StatusCode, "%s: status code", desc)
- assert.Equal(t, tc.content, string(b), "%s: response body", desc)
- assert.Equal(t, tc.contentEncoding, resp.Header.Get("Content-Encoding"), "%s: response body", desc)
- assert.False(t, proxied, "%s: should not have made it to backend", desc)
+ require.Equal(t, 200, resp.StatusCode, "%s: status code", desc)
+ require.Equal(t, tc.content, string(b), "%s: response body", desc)
+ require.Equal(t, tc.contentEncoding, resp.Header.Get("Content-Encoding"), "%s: response body", desc)
+ require.False(t, proxied, "%s: should not have made it to backend", desc)
}
}
@@ -364,9 +363,9 @@ func TestArtifactsGetSingleFile(t *testing.T) {
resp, body, err := doSendDataRequest(resourcePath, "artifacts-entry", jsonParams)
require.NoError(t, err)
- assert.Equal(t, 200, resp.StatusCode, "GET %q: status code", resourcePath)
- assert.Equal(t, fileContents, string(body), "GET %q: response body", resourcePath)
- assertNginxResponseBuffering(t, "no", resp, "GET %q: nginx response buffering", resourcePath)
+ require.Equal(t, 200, resp.StatusCode, "GET %q: status code", resourcePath)
+ require.Equal(t, fileContents, string(body), "GET %q: response body", resourcePath)
+ requireNginxResponseBuffering(t, "no", resp, "GET %q: nginx response buffering", resourcePath)
}
func TestImageResizing(t *testing.T) {
@@ -378,7 +377,7 @@ func TestImageResizing(t *testing.T) {
resp, body, err := doSendDataRequest(resourcePath, "send-scaled-img", jsonParams)
require.NoError(t, err, "send resize request")
- assert.Equal(t, 200, resp.StatusCode, "GET %q: status code", resourcePath)
+ require.Equal(t, 200, resp.StatusCode, "GET %q: status code", resourcePath)
img, err := png.Decode(bytes.NewReader(body))
require.NoError(t, err, "decode resized image")
@@ -437,7 +436,7 @@ func TestSendURLForArtifacts(t *testing.T) {
require.Equal(t, int64(tc.contentLength), resp.ContentLength, "GET %q: Content-Length", resourcePath)
require.Equal(t, tc.transferEncoding, resp.TransferEncoding, "GET %q: Transfer-Encoding", resourcePath)
require.Equal(t, expectedBody, string(body), "GET %q: response body", resourcePath)
- assertNginxResponseBuffering(t, "no", resp, "GET %q: nginx response buffering", resourcePath)
+ requireNginxResponseBuffering(t, "no", resp, "GET %q: nginx response buffering", resourcePath)
})
}
}
@@ -457,8 +456,8 @@ func TestApiContentTypeBlock(t *testing.T) {
resourcePath := "/something"
resp, body := httpGet(t, ws.URL+resourcePath, nil)
- assert.Equal(t, 500, resp.StatusCode, "GET %q: status code", resourcePath)
- assert.NotContains(t, wrongResponse, body, "GET %q: response body", resourcePath)
+ require.Equal(t, 500, resp.StatusCode, "GET %q: status code", resourcePath)
+ require.NotContains(t, wrongResponse, body, "GET %q: response body", resourcePath)
}
func TestAPIFalsePositivesAreProxied(t *testing.T) {
@@ -490,22 +489,20 @@ func TestAPIFalsePositivesAreProxied(t *testing.T) {
{"PUT", "/nested/group/project/blob/master/foo.git/gitlab-lfs/objects/0000000000000000000000000000000000000000000000000000000000000000/0"},
{"GET", "/nested/group/project/blob/master/environments/1/terminal.ws"},
} {
- req, err := http.NewRequest(tc.method, ws.URL+tc.path, nil)
- if !assert.NoError(t, err, "Constructing %s %q", tc.method, tc.path) {
- continue
- }
- resp, err := http.DefaultClient.Do(req)
- if !assert.NoError(t, err, "%s %q", tc.method, tc.path) {
- continue
- }
- defer resp.Body.Close()
-
- respBody, err := ioutil.ReadAll(resp.Body)
- assert.NoError(t, err, "%s %q: reading body", tc.method, tc.path)
-
- assert.Equal(t, 200, resp.StatusCode, "%s %q: status code", tc.method, tc.path)
- testhelper.RequireResponseHeader(t, resp, "Content-Type", "text/html")
- assert.Equal(t, string(goodResponse), string(respBody), "%s %q: response body", tc.method, tc.path)
+ t.Run(tc.method+"_"+tc.path, func(t *testing.T) {
+ req, err := http.NewRequest(tc.method, ws.URL+tc.path, nil)
+ require.NoError(t, err, "Constructing %s %q", tc.method, tc.path)
+ resp, err := http.DefaultClient.Do(req)
+ require.NoError(t, err, "%s %q", tc.method, tc.path)
+ defer resp.Body.Close()
+
+ respBody, err := ioutil.ReadAll(resp.Body)
+ require.NoError(t, err, "%s %q: reading body", tc.method, tc.path)
+
+ require.Equal(t, 200, resp.StatusCode, "%s %q: status code", tc.method, tc.path)
+ testhelper.RequireResponseHeader(t, resp, "Content-Type", "text/html")
+ require.Equal(t, string(goodResponse), string(respBody), "%s %q: response body", tc.method, tc.path)
+ })
}
}
@@ -523,9 +520,9 @@ func TestCorrelationIdHeader(t *testing.T) {
} {
resp, _ := httpGet(t, ws.URL+resource, nil)
- assert.Equal(t, 200, resp.StatusCode, "GET %q: status code", resource)
+ require.Equal(t, 200, resp.StatusCode, "GET %q: status code", resource)
requestIds := resp.Header["X-Request-Id"]
- assert.Equal(t, 1, len(requestIds), "GET %q: One X-Request-Id present", resource)
+ require.Equal(t, 1, len(requestIds), "GET %q: One X-Request-Id present", resource)
}
}
@@ -563,13 +560,13 @@ func TestPropagateCorrelationIdHeader(t *testing.T) {
resp, _ := httpGet(t, ws.URL+resource, map[string]string{"X-Request-Id": propagatedRequestId})
requestIds := resp.Header["X-Request-Id"]
- assert.Equal(t, 200, resp.StatusCode, "GET %q: status code", resource)
- assert.Equal(t, 1, len(requestIds), "GET %q: One X-Request-Id present", resource)
+ require.Equal(t, 200, resp.StatusCode, "GET %q: status code", resource)
+ require.Equal(t, 1, len(requestIds), "GET %q: One X-Request-Id present", resource)
if tc.propagateCorrelationID {
- assert.Contains(t, requestIds, propagatedRequestId, "GET %q: Has X-Request-Id %s present", resource, propagatedRequestId)
+ require.Contains(t, requestIds, propagatedRequestId, "GET %q: Has X-Request-Id %s present", resource, propagatedRequestId)
} else {
- assert.NotContains(t, requestIds, propagatedRequestId, "GET %q: X-Request-Id not propagated")
+ require.NotContains(t, requestIds, propagatedRequestId, "GET %q: X-Request-Id not propagated")
}
})
}
@@ -712,9 +709,9 @@ func httpPost(t *testing.T, url string, headers map[string]string, reqBody io.Re
return resp
}
-func assertNginxResponseBuffering(t *testing.T, expected string, resp *http.Response, msgAndArgs ...interface{}) {
+func requireNginxResponseBuffering(t *testing.T, expected string, resp *http.Response, msgAndArgs ...interface{}) {
actual := resp.Header.Get(helper.NginxResponseBufferHeader)
- assert.Equal(t, expected, actual, msgAndArgs...)
+ require.Equal(t, expected, actual, msgAndArgs...)
}
// TestHealthChecksNoStaticHTML verifies that health endpoints pass errors through and don't return the static html error pages
@@ -747,9 +744,9 @@ This is a static error page for code 503
t.Run(resource, func(t *testing.T) {
resp, body := httpGet(t, ws.URL+resource, nil)
- assert.Equal(t, 503, resp.StatusCode, "status code")
- assert.Equal(t, apiResponse, body, "response body")
- assertNginxResponseBuffering(t, "", resp, "nginx response buffering")
+ require.Equal(t, 503, resp.StatusCode, "status code")
+ require.Equal(t, apiResponse, body, "response body")
+ requireNginxResponseBuffering(t, "", resp, "nginx response buffering")
})
}
}
@@ -773,10 +770,10 @@ func TestHealthChecksUnreachable(t *testing.T) {
t.Run(tc.path, func(t *testing.T) {
resp, body := httpGet(t, ws.URL+tc.path, nil)
- assert.Equal(t, 502, resp.StatusCode, "status code")
- assert.Equal(t, tc.responseType, resp.Header.Get("Content-Type"), "content-type")
- assert.Equal(t, tc.content, body, "response body")
- assertNginxResponseBuffering(t, "", resp, "nginx response buffering")
+ require.Equal(t, 502, resp.StatusCode, "status code")
+ require.Equal(t, tc.responseType, resp.Header.Get("Content-Type"), "content-type")
+ require.Equal(t, tc.content, body, "response body")
+ requireNginxResponseBuffering(t, "", resp, "nginx response buffering")
})
}
}
diff --git a/upload_test.go b/upload_test.go
index 4863827d5b9a1c1f4e661003b57767a631fbce06..c08d04b100a3f2539d002d8c8df37e11dbadc113 100644
--- a/upload_test.go
+++ b/upload_test.go
@@ -15,7 +15,6 @@ import (
"testing"
"github.com/dgrijalva/jwt-go"
- "github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"gitlab.com/gitlab-org/gitlab-workhorse/internal/api"
@@ -49,10 +48,10 @@ func testArtifactsUpload(t *testing.T, uploadArtifacts uploadArtifactsFunction)
defer ws.Close()
resp, resource, err := uploadArtifacts(ws.URL, contentType, reqBody)
- assert.NoError(t, err)
+ require.NoError(t, err)
defer resp.Body.Close()
- assert.Equal(t, 200, resp.StatusCode, "GET %q: expected 200, got %d", resource, resp.StatusCode)
+ require.Equal(t, 200, resp.StatusCode, "GET %q: expected 200, got %d", resource, resp.StatusCode)
}
func TestArtifactsUpload(t *testing.T) {