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

Revert "assert detected language in agent workloadmeta in e2e test" #33357

Merged
merged 2 commits into from
Jan 24, 2025
Merged

Revert "assert detected language in agent workloadmeta in e2e test" #33357

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a7aeed0
Revert "[CONTP-547] assert detected language in agent workloadmeta in…
adel121 Jan 24, 2025
8ead854
Merge branch 'main' into adelhajhassan/revert_agent_cli_assertion_e2e…
adel121 Jan 24, 2025
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
17 changes: 5 additions & 12 deletions test/new-e2e/tests/containers/k8s_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
Expand Down
Loading