github/troubleshoot
1
0
Fork 0
mirror of https://github.com/replicatedhq/troubleshoot.git synced 2026-02-14 10:19:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(e2e): race condition causes tests to fail (#1603)

Browse Source
This commit is contained in:
Ethan Mosbaugh
2024-08-23 07:07:02 -07:00
committed by GitHub
parent 1b1efa133e
commit 3aaffb424b
2 changed files with 26 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
test/e2e/support-bundle/goldpinger_collector_e2e_test.go
View File

@@ -16,8 +16,8 @@ import (
"github.com/replicatedhq/troubleshoot/pkg/convert"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
v1 "k8s.io/api/core/v1"
"sigs.k8s.io/e2e-framework/klient/k8s/resources"
appsv1 "k8s.io/api/apps/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"sigs.k8s.io/e2e-framework/klient/wait"
"sigs.k8s.io/e2e-framework/klient/wait/conditions"
"sigs.k8s.io/e2e-framework/pkg/envconf"
@@ -48,6 +48,7 @@ func Test_GoldpingerCollector(t *testing.T) {
feature := features.New("Goldpinger collector and analyser").
Setup(func(ctx context.Context, t *testing.T, c *envconf.Config) context.Context {
cluster := getClusterFromContext(t, ctx, ClusterName)
manager := helm.New(cluster.GetKubeconfig())
err := manager.RunInstall(
helm.WithName(releaseName),
@@ -57,22 +58,21 @@ func Test_GoldpingerCollector(t *testing.T) {
helm.WithTimeout("2m"),
)
require.NoError(t, err)
client, err := c.NewClient()
require.NoError(t, err)
pods := &v1.PodList{}
// Lets wait for the goldpinger pods to be running
err = client.Resources().WithNamespace(c.Namespace()).List(ctx, pods,
resources.WithLabelSelector("app.kubernetes.io/name=goldpinger"),
)
require.NoError(t, err)
require.Len(t, pods.Items, 1)
ds := &appsv1.DaemonSet{ObjectMeta: metav1.ObjectMeta{Name: "goldpinger", Namespace: c.Namespace()}}
err = wait.For(
conditions.New(client.Resources()).PodRunning(&pods.Items[0]),
conditions.New(client.Resources()).DaemonSetReady(ds),
wait.WithTimeout(time.Second*30),
)
require.NoError(t, err)
// HACK: wait for goldpinger to do its thing
time.Sleep(time.Second * 30)
return ctx
}).
Assess("collect and analyse goldpinger pings", func(ctx context.Context, t *testing.T, c *envconf.Config) context.Context {
@@ -108,7 +108,7 @@ func Test_GoldpingerCollector(t *testing.T) {
// Check that we analysed collected goldpinger results.
// We should expect a single analysis result for goldpinger.
assert.Equal(t, 1, len(analysisResults))
assert.True(t, strings.HasPrefix(analysisResults[0].Name, "missing.ping.results.for.goldpinger."))
assert.True(t, strings.HasPrefix(analysisResults[0].Name, "pings.to.goldpinger."))
if t.Failed() {
t.Logf("Analysis results: %s\n", analysisJSON)
t.Logf("Stdout: %s\n", out.String())
@@ -121,7 +121,8 @@ func Test_GoldpingerCollector(t *testing.T) {
Teardown(func(ctx context.Context, t *testing.T, c *envconf.Config) context.Context {
cluster := getClusterFromContext(t, ctx, ClusterName)
manager := helm.New(cluster.GetKubeconfig())
manager.RunUninstall(helm.WithName(releaseName), helm.WithNamespace(c.Namespace()))
err := manager.RunUninstall(helm.WithName(releaseName), helm.WithNamespace(c.Namespace()))
require.NoError(t, err)
return ctx
}).
Feature()

17
test/e2e/support-bundle/helm_collector_e2e_test.go
View File

@@ -16,6 +16,7 @@ import (
collect "github.com/replicatedhq/troubleshoot/pkg/collect"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
)
var curDir, _ = os.Getwd()
@@ -27,8 +28,15 @@ func Test_HelmCollector(t *testing.T) {
Setup(func(ctx context.Context, t *testing.T, c *envconf.Config) context.Context {
cluster := getClusterFromContext(t, ctx, ClusterName)
manager := helm.New(cluster.GetKubeconfig())
manager.RunInstall(helm.WithName(releaseName), helm.WithNamespace(c.Namespace()), helm.WithChart(filepath.Join(curDir, "testdata/charts/nginx-15.2.0.tgz")), helm.WithArgs("-f "+filepath.Join(curDir, "testdata/helm-values.yaml")), helm.WithWait(), helm.WithTimeout("1m"))
//ignore error to allow test to speed up, helm collector will catch the pending or deployed helm release status
manager.RunInstall(
helm.WithName(releaseName),
helm.WithNamespace(c.Namespace()),
helm.WithChart(filepath.Join(curDir, "testdata/charts/nginx-15.2.0.tgz")),
helm.WithArgs("-f "+filepath.Join(curDir, "testdata/helm-values.yaml")),
helm.WithWait(),
helm.WithTimeout("1m"),
)
// ignore error to allow test to speed up, helm collector will catch the pending or deployed helm release status
return ctx
}).
Assess("check support bundle catch helm release", func(ctx context.Context, t *testing.T, c *envconf.Config) context.Context {
@@ -62,7 +70,7 @@ func Test_HelmCollector(t *testing.T) {
if err != nil {
t.Fatal(err)
}
assert.Equal(t, 1, len(results))
require.Equal(t, 1, len(results))
assert.Equal(t, releaseName, results[0].ReleaseName)
assert.Equal(t, "nginx", results[0].Chart)
assert.Equal(t, map[string]interface{}{"name": "TEST_ENV_VAR", "value": "test-value"}, results[0].VersionInfo[0].Values["extraEnvVars"].([]interface{})[0])
@@ -72,7 +80,8 @@ func Test_HelmCollector(t *testing.T) {
Teardown(func(ctx context.Context, t *testing.T, c *envconf.Config) context.Context {
cluster := getClusterFromContext(t, ctx, ClusterName)
manager := helm.New(cluster.GetKubeconfig())
manager.RunUninstall(helm.WithName(releaseName), helm.WithNamespace(c.Namespace()))
err := manager.RunUninstall(helm.WithName(releaseName), helm.WithNamespace(c.Namespace()))
require.NoError(t, err)
return ctx
}).
Feature()