From 12691979b0dd9e89c57fb0107fa3b185acd7015b Mon Sep 17 00:00:00 2001 From: Michael Butler Date: Tue, 14 May 2024 12:55:25 -0400 Subject: [PATCH] streamingccl: deflake a few tests As of #123934, the producer job succeeds instead of fails. This patch teaches some test infra about this. Fixes #124139 Fixes #124138 Fixes #124151 Fixes #124137 Release note: none --- pkg/ccl/streamingccl/replicationtestutils/testutils.go | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/pkg/ccl/streamingccl/replicationtestutils/testutils.go b/pkg/ccl/streamingccl/replicationtestutils/testutils.go index a0239312b09c..52afd84ab3d3 100644 --- a/pkg/ccl/streamingccl/replicationtestutils/testutils.go +++ b/pkg/ccl/streamingccl/replicationtestutils/testutils.go @@ -252,13 +252,7 @@ ORDER BY created DESC LIMIT 1`, c.Args.DestTenantName) // Grab the latest producer job on the destination cluster. var status string c.DestSysSQL.QueryRow(c.T, "SELECT status FROM system.jobs WHERE id = $1", retentionJobID).Scan(&status) - if jobs.Status(status) == jobs.StatusRunning { - return nil - } - if jobs.Status(status) == jobs.StatusFailed { - payload := jobutils.GetJobPayload(c.T, c.DestSysSQL, retentionJobID) - require.Contains(c.T, payload.Error, "replication stream") - require.Contains(c.T, payload.Error, "timed out") + if jobs.Status(status) == jobs.StatusRunning || jobs.Status(status) == jobs.StatusSucceeded { return nil } return errors.Newf("Unexpected status %s", status)