summaryrefslogtreecommitdiff
path: root/client/httpclient_test.go
diff options
context:
space:
mode:
authorAsh McKenzie <amckenzie@gitlab.com>2020-09-21 04:47:01 +0000
committerAsh McKenzie <amckenzie@gitlab.com>2020-09-21 04:47:01 +0000
commit1a2bfecd2f0ebb8e31f9833e0522c4643797041b (patch)
treed17cf7bff45492a587027851bb6e0bcb493cff58 /client/httpclient_test.go
parentf100e7e83943b3bb5db232f5bf79a616fdba88f1 (diff)
parenta487572a904cc149840488eefdfe121173d8bcb5 (diff)
downloadgitlab-shell-1a2bfecd2f0ebb8e31f9833e0522c4643797041b.tar.gz
Merge branch 'sh-extract-context-from-env' into 'master'
Make it possible to propagate correlation ID across processes Closes #474 See merge request gitlab-org/gitlab-shell!413
Diffstat (limited to 'client/httpclient_test.go')
-rw-r--r--client/httpclient_test.go7
1 files changed, 4 insertions, 3 deletions
diff --git a/client/httpclient_test.go b/client/httpclient_test.go
index fce0cd5..97e1384 100644
--- a/client/httpclient_test.go
+++ b/client/httpclient_test.go
@@ -1,6 +1,7 @@
package client
import (
+ "context"
"encoding/base64"
"fmt"
"io/ioutil"
@@ -51,11 +52,11 @@ func TestBasicAuthSettings(t *testing.T) {
client, cleanup := setup(t, username, password, requests)
defer cleanup()
- response, err := client.Get("/get_endpoint")
+ response, err := client.Get(context.Background(), "/get_endpoint")
require.NoError(t, err)
testBasicAuthHeaders(t, response)
- response, err = client.Post("/post_endpoint", nil)
+ response, err = client.Post(context.Background(), "/post_endpoint", nil)
require.NoError(t, err)
testBasicAuthHeaders(t, response)
}
@@ -89,7 +90,7 @@ func TestEmptyBasicAuthSettings(t *testing.T) {
client, cleanup := setup(t, "", "", requests)
defer cleanup()
- _, err := client.Get("/empty_basic_auth")
+ _, err := client.Get(context.Background(), "/empty_basic_auth")
require.NoError(t, err)
}