Merge #152689

152689: changefeedccl: fix test flake by waiting for rangefeed start r=andyyang890 a=aerfrei

Previously, this test would flake because a table that we were asserting the admin user could see hadn't yet become visible. Now we assert the changefeed and rangefeed have started by waiting for a highwater mark.

Epic: none
Fixes: #152060

Release note: None

Co-authored-by: Aerin Freilich <[email protected]>

Author: craig[bot]

pkg/ccl/changefeedccl/changefeed_test.go

@@ -9583,8 +9583,6 @@ func TestDistSenderRangeFeedPopulatesVirtualTable(t *testing.T) {
 	defer leaktest.AfterTest(t)()
 	defer log.Scope(t).Close(t)
 
-	skip.WithIssue(t, 152060)
-
 	scanner := keysutil.MakePrettyScanner(nil, nil)
 
 	observeTables := func(sqlDB *sqlutils.SQLRunner, codec keys.SQLCodec) []int {
@@ -9628,6 +9626,10 @@ func TestDistSenderRangeFeedPopulatesVirtualTable(t *testing.T) {
 		})
 		defer closeFeed(t, cf)
 
+		// We need to ensure that the reason the user doesn't see the table
+		// is not because the rangefeed hasn't started yet.
+		waitForHighwater(t, cf.(cdctest.EnterpriseTestFeed), s.Server.JobRegistry().(*jobs.Registry))
+
 		for _, c := range cases {
 			testutils.SucceedsSoon(t, func() error {
 				asUser(t, f, c.user, func(userDB *sqlutils.SQLRunner) {