Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Correct & parallelize tests #522

Merged
merged 2 commits into from
Dec 4, 2021
Merged

Correct & parallelize tests #522

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d6c2b44
ensure that the test HTTP handlers are called
Dec 4, 2021
9de3d99
parallelize HTTP server dependent tests
Dec 4, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
49 changes: 37 additions & 12 deletions pkg/client/rekor_client_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,16 +25,21 @@ import (
)

func TestAPIKey(t *testing.T) {
t.Parallel()
pkRequestReceived := false
logRequestReceived := false
testServer := httptest.NewServer(http.HandlerFunc(
func(w http.ResponseWriter, r *http.Request) {
file := []byte{}

switch {
case strings.HasPrefix(r.URL.Path, "/api/v1/log/publicKey"):
pkRequestReceived = true
if r.URL.Query().Get("apiKey") != "" {
t.Errorf("API key sent but not expected: %v", r.URL.Query().Get("apiKey"))
}
case strings.HasPrefix(r.URL.Path, "/api/v1/log"):
logRequestReceived = true
if r.URL.Query().Get("apiKey") == "" {
t.Errorf("API key expected but not sent")
}
Expand All @@ -44,25 +49,42 @@ func TestAPIKey(t *testing.T) {
}))
defer testServer.Close()

viper.Set("api-key", "thisIsAnAPIKey")
client, err := GetRekorClient(testServer.URL)
if err != nil {
t.Error(err)
}
_, _ = client.Tlog.GetLogInfo(nil)
t.Run("GetLogInfo", func(t *testing.T) {
logRequestReceived = false
viper.Set("api-key", "thisIsAnAPIKey")
client, err := GetRekorClient(testServer.URL)
if err != nil {
t.Error(err)
}
_, _ = client.Tlog.GetLogInfo(nil)
if !logRequestReceived {
t.Fatal("no GetLogInfo requests were received")
}
})

t.Run("GetPublicKey", func(t *testing.T) {
pkRequestReceived = false
viper.Set("api-key", "")
client, err := GetRekorClient(testServer.URL)
if err != nil {
t.Error(err)
}
_, _ = client.Pubkey.GetPublicKey(nil)
if !pkRequestReceived {
t.Fatal("no GetPublicKey requests were received")
}

})

viper.Set("api-key", "")
client, err = GetRekorClient(testServer.URL)
if err != nil {
t.Error(err)
}
_, _ = client.Pubkey.GetPublicKey(nil)
}

func TestGetRekorClientWithOptions(t *testing.T) {
t.Parallel()
expectedUserAgent := "test User-Agent"
requestReceived := false
testServer := httptest.NewServer(http.HandlerFunc(
func(w http.ResponseWriter, r *http.Request) {
requestReceived = true
file := []byte{}

got := r.UserAgent()
Expand All @@ -79,4 +101,7 @@ func TestGetRekorClientWithOptions(t *testing.T) {
t.Error(err)
}
_, _ = client.Tlog.GetLogInfo(nil)
if !requestReceived {
t.Fatal("no requests were received")
}
}