From a7aeed083b30f5af6786ce246d9156df8940a466 Mon Sep 17 00:00:00 2001 From: adel121 Date: Fri, 24 Jan 2025 15:48:29 +0100 Subject: [PATCH] Revert "[CONTP-547] assert detected language in agent workloadmeta in e2e test (#33253)" This reverts commit 50a3aa62009b763dda49d52700b159797298659c. --- test/new-e2e/tests/containers/k8s_test.go | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/test/new-e2e/tests/containers/k8s_test.go b/test/new-e2e/tests/containers/k8s_test.go index 58ea254cc61dba..de9b9c43ba4ce7 100644 --- a/test/new-e2e/tests/containers/k8s_test.go +++ b/test/new-e2e/tests/containers/k8s_test.go @@ -348,18 +348,11 @@ func (suite *k8sSuite) testAgentCLI() { }) suite.Run("agent workload-list", func() { - var stdout string - var stderr string - suite.EventuallyWithT(func(c *assert.CollectT) { - stdout, stderr, err = suite.podExec("datadog", pod.Items[0].Name, "agent", []string{"agent", "workload-list", "-v"}) - if !assert.NoError(c, err) { - return - } - assert.Empty(c, stderr, "Standard error of `agent workload-list` should be empty") - assert.Contains(c, stdout, "=== Entity container sources(merged):[node_orchestrator runtime] id: ") - assert.Contains(c, stdout, "=== Entity kubernetes_pod sources(merged):[cluster_orchestrator node_orchestrator] id: ") - assert.Contains(c, stdout, "Language: python") // Added temporarily to investigate flaky e2e test - }, 2*time.Minute, 1*time.Second) + stdout, stderr, err := suite.podExec("datadog", pod.Items[0].Name, "agent", []string{"agent", "workload-list", "-v"}) + suite.Require().NoError(err) + suite.Empty(stderr, "Standard error of `agent workload-list` should be empty") + suite.Contains(stdout, "=== Entity container sources(merged):[node_orchestrator runtime] id: ") + suite.Contains(stdout, "=== Entity kubernetes_pod sources(merged):[cluster_orchestrator node_orchestrator] id: ") if suite.T().Failed() { suite.T().Log(stdout) }