Skip to content

Commit

Permalink
[mq] working branch - merge 8ead854 on top of main at de757fc
Browse files Browse the repository at this point in the history
{"baseBranch":"main","baseCommit":"de757fc7e669ca0a9a039f3ae0259ebae2944485","createdAt":"2025-01-24T14:49:47.587019Z","headSha":"8ead8545a5397c0d274358d71b2f47dc506d7d19","id":"7458a7b6-d302-46df-a95c-9f5e06048d43","priority":"200","pullRequestNumber":"33357","queuedAt":"2025-01-24T17:56:07.644908Z","status":"STATUS_QUEUED"}
  • Loading branch information
dd-mergequeue[bot] authored Jan 24, 2025
2 parents 1628366 + 8ead854 commit 38fb861
Showing 1 changed file with 5 additions and 12 deletions.
17 changes: 5 additions & 12 deletions test/new-e2e/tests/containers/k8s_test.go
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

0 comments on commit 38fb861

Please sign in to comment.