Merge pull request #501 from mattmoyer/deflake-get-category-test
Improve the reliability of TestGetPinnipedCategory.
This commit is contained in:
Matt Moyer
GitHub
commit
d85135c12e
@ -6,118 +6,110 @@ package integration
|
||||
import (
|
||||
"bytes"
|
||||
"os/exec"
|
||||
"strings"
|
||||
"sync"
|
||||
"testing"
|
||||
"time"
|
||||
|
||||
"github.com/stretchr/testify/assert"
|
||||
"github.com/stretchr/testify/require"
|
||||
|
||||
"go.pinniped.dev/test/library"
|
||||
)
|
||||
|
||||
func TestGetPinnipedCategory(t *testing.T) {
|
||||
env := library.IntegrationEnv(t)
|
||||
dotSuffix := "." + env.APIGroupSuffix
|
||||
func runTestKubectlCommand(t *testing.T, args ...string) (string, string) {
|
||||
t.Helper()
|
||||
|
||||
t.Run("category, no special params", func(t *testing.T) {
|
||||
var lock sync.Mutex
|
||||
var stdOut, stdErr bytes.Buffer
|
||||
|
||||
var err error
|
||||
require.Eventuallyf(t, func() bool {
|
||||
cmd := exec.Command("kubectl", "get", "pinniped", "-A")
|
||||
start := time.Now()
|
||||
attempts := 0
|
||||
if !assert.Eventually(t, func() bool {
|
||||
lock.Lock()
|
||||
defer lock.Unlock()
|
||||
attempts++
|
||||
stdOut.Reset()
|
||||
stdErr.Reset()
|
||||
cmd := exec.Command("kubectl", args...)
|
||||
cmd.Stdout = &stdOut
|
||||
cmd.Stderr = &stdErr
|
||||
err = cmd.Run()
|
||||
return err == nil
|
||||
},
|
||||
60*time.Second,
|
||||
1*time.Second,
|
||||
"never ran 'kubectl get pinniped -A' successfully:\n%s\n\n%s",
|
||||
stdErr.String(),
|
||||
stdOut.String(),
|
||||
120*time.Second,
|
||||
200*time.Millisecond,
|
||||
) {
|
||||
lock.Lock()
|
||||
defer lock.Unlock()
|
||||
t.Logf(
|
||||
"never ran %q successfully even after %d attempts (%s)",
|
||||
"kubectl "+strings.Join(args, " "),
|
||||
attempts,
|
||||
time.Since(start).Round(time.Second),
|
||||
)
|
||||
require.Empty(t, stdErr.String())
|
||||
require.NotContains(t, stdOut.String(), "MethodNotAllowed")
|
||||
require.Contains(t, stdOut.String(), dotSuffix)
|
||||
t.Logf("last error: %v", err)
|
||||
t.Logf("stdout:\n%s\n", stdOut.String())
|
||||
t.Logf("stderr:\n%s\n", stdErr.String())
|
||||
t.FailNow()
|
||||
}
|
||||
return stdOut.String(), stdErr.String()
|
||||
}
|
||||
func TestGetPinnipedCategory(t *testing.T) {
|
||||
env := library.IntegrationEnv(t)
|
||||
dotSuffix := "." + env.APIGroupSuffix
|
||||
|
||||
t.Run("category, no special params", func(t *testing.T) {
|
||||
t.Parallel()
|
||||
stdout, stderr := runTestKubectlCommand(t, "get", "pinniped", "-A")
|
||||
require.Empty(t, stderr)
|
||||
require.NotContains(t, stdout, "MethodNotAllowed")
|
||||
require.Contains(t, stdout, dotSuffix)
|
||||
})
|
||||
|
||||
t.Run("category, table params", func(t *testing.T) {
|
||||
var stdOut, stdErr bytes.Buffer
|
||||
|
||||
cmd := exec.Command("kubectl", "get", "pinniped", "-A", "-o", "wide", "-v", "10")
|
||||
cmd.Stdout = &stdOut
|
||||
cmd.Stderr = &stdErr
|
||||
err := cmd.Run()
|
||||
require.NoError(t, err, stdErr.String(), stdOut.String())
|
||||
|
||||
require.NotContains(t, stdOut.String(), "MethodNotAllowed")
|
||||
require.Contains(t, stdOut.String(), dotSuffix)
|
||||
|
||||
require.Contains(t, stdErr.String(), `"kind":"Table"`)
|
||||
require.Contains(t, stdErr.String(), `"resourceVersion":"0"`)
|
||||
require.Contains(t, stdErr.String(), `/v1alpha1/tokencredentialrequests`)
|
||||
require.Contains(t, stdErr.String(), `/v1alpha1/whoamirequests`)
|
||||
t.Parallel()
|
||||
stdout, stderr := runTestKubectlCommand(t, "get", "pinniped", "-A", "-o", "wide", "-v", "10")
|
||||
require.NotContains(t, stdout, "MethodNotAllowed")
|
||||
require.Contains(t, stdout, dotSuffix)
|
||||
require.Contains(t, stderr, `"kind":"Table"`)
|
||||
require.Contains(t, stderr, `"resourceVersion":"0"`)
|
||||
require.Contains(t, stderr, `/v1alpha1/tokencredentialrequests`)
|
||||
require.Contains(t, stderr, `/v1alpha1/whoamirequests`)
|
||||
})
|
||||
|
||||
t.Run("list, no special params", func(t *testing.T) {
|
||||
var stdOut, stdErr bytes.Buffer
|
||||
|
||||
//nolint: gosec // input is part of test env
|
||||
cmd := exec.Command("kubectl", "get", "tokencredentialrequests.login.concierge"+dotSuffix, "-A")
|
||||
cmd.Stdout = &stdOut
|
||||
cmd.Stderr = &stdErr
|
||||
err := cmd.Run()
|
||||
require.NoError(t, err, stdErr.String(), stdOut.String())
|
||||
require.Empty(t, stdOut.String())
|
||||
|
||||
require.NotContains(t, stdErr.String(), "MethodNotAllowed")
|
||||
require.Contains(t, stdErr.String(), `No resources found`)
|
||||
t.Parallel()
|
||||
stdout, stderr := runTestKubectlCommand(t, "get", "tokencredentialrequests.login.concierge"+dotSuffix, "-A")
|
||||
require.Empty(t, stdout)
|
||||
require.NotContains(t, stderr, "MethodNotAllowed")
|
||||
require.Contains(t, stderr, `No resources found`)
|
||||
})
|
||||
|
||||
t.Run("list, table params", func(t *testing.T) {
|
||||
var stdOut, stdErr bytes.Buffer
|
||||
|
||||
//nolint: gosec // input is part of test env
|
||||
cmd := exec.Command("kubectl", "get", "tokencredentialrequests.login.concierge"+dotSuffix, "-A", "-o", "wide", "-v", "10")
|
||||
cmd.Stdout = &stdOut
|
||||
cmd.Stderr = &stdErr
|
||||
err := cmd.Run()
|
||||
require.NoError(t, err, stdErr.String(), stdOut.String())
|
||||
require.Empty(t, stdOut.String())
|
||||
|
||||
require.NotContains(t, stdErr.String(), "MethodNotAllowed")
|
||||
require.Contains(t, stdErr.String(), `"kind":"Table"`)
|
||||
require.Contains(t, stdErr.String(), `"resourceVersion":"0"`)
|
||||
t.Parallel()
|
||||
stdout, stderr := runTestKubectlCommand(t, "get", "tokencredentialrequests.login.concierge"+dotSuffix, "-A", "-o", "wide", "-v", "10")
|
||||
require.Empty(t, stdout)
|
||||
require.NotContains(t, stderr, "MethodNotAllowed")
|
||||
require.Contains(t, stderr, `"kind":"Table"`)
|
||||
require.Contains(t, stderr, `"resourceVersion":"0"`)
|
||||
})
|
||||
|
||||
t.Run("raw request to see body, token cred", func(t *testing.T) {
|
||||
var stdOut, stdErr bytes.Buffer
|
||||
|
||||
//nolint: gosec // input is part of test env
|
||||
cmd := exec.Command("kubectl", "get", "--raw", "/apis/login.concierge"+dotSuffix+"/v1alpha1/tokencredentialrequests")
|
||||
cmd.Stdout = &stdOut
|
||||
cmd.Stderr = &stdErr
|
||||
err := cmd.Run()
|
||||
require.NoError(t, err, stdErr.String(), stdOut.String())
|
||||
require.Empty(t, stdErr.String())
|
||||
|
||||
require.NotContains(t, stdOut.String(), "MethodNotAllowed")
|
||||
require.Contains(t, stdOut.String(), `{"kind":"TokenCredentialRequestList","apiVersion":"login.concierge`+
|
||||
t.Parallel()
|
||||
stdout, stderr := runTestKubectlCommand(t, "get", "--raw", "/apis/login.concierge"+dotSuffix+"/v1alpha1/tokencredentialrequests")
|
||||
require.NotContains(t, stdout, "MethodNotAllowed")
|
||||
require.Contains(t, stdout, `{"kind":"TokenCredentialRequestList","apiVersion":"login.concierge`+
|
||||
dotSuffix+`/v1alpha1","metadata":{"resourceVersion":"0"},"items":[]}`)
|
||||
require.Empty(t, stderr)
|
||||
})
|
||||
|
||||
t.Run("raw request to see body, whoami", func(t *testing.T) {
|
||||
var stdOut, stdErr bytes.Buffer
|
||||
|
||||
//nolint: gosec // input is part of test env
|
||||
cmd := exec.Command("kubectl", "get", "--raw", "/apis/identity.concierge"+dotSuffix+"/v1alpha1/whoamirequests")
|
||||
cmd.Stdout = &stdOut
|
||||
cmd.Stderr = &stdErr
|
||||
err := cmd.Run()
|
||||
require.NoError(t, err, stdErr.String(), stdOut.String())
|
||||
require.Empty(t, stdErr.String())
|
||||
|
||||
require.NotContains(t, stdOut.String(), "MethodNotAllowed")
|
||||
require.Contains(t, stdOut.String(), `{"kind":"WhoAmIRequestList","apiVersion":"identity.concierge`+
|
||||
t.Parallel()
|
||||
stdout, stderr := runTestKubectlCommand(t, "get", "--raw", "/apis/identity.concierge"+dotSuffix+"/v1alpha1/whoamirequests")
|
||||
require.NotContains(t, stdout, "MethodNotAllowed")
|
||||
require.Contains(t, stdout, `{"kind":"WhoAmIRequestList","apiVersion":"identity.concierge`+
|
||||
dotSuffix+`/v1alpha1","metadata":{"resourceVersion":"0"},"items":[]}`)
|
||||
require.Empty(t, stderr)
|
||||
})
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user