skip another test

Author: aerfrei

pkg/ccl/changefeedccl/alter_changefeed_test.go

@@ -791,8 +791,8 @@ func TestAlterChangefeedDropAllTargetsError(t *testing.T) {
 }
 
 func TestAlterChangefeedTelemetry(t *testing.T) {
-	skip.WithIssue(t, 148858) // has baz unwatched table
 	defer leaktest.AfterTest(t)()
+	skip.WithIssue(t, 148858) // has baz unwatched table
 	defer log.Scope(t).Close(t)
 
 	testFn := func(t *testing.T, s TestServer, f cdctest.TestFeedFactory) {
@@ -1069,6 +1069,7 @@ func TestAlterChangefeedAddTargetErrors(t *testing.T) {
 func TestAlterChangefeedDatabaseQualifiedNames(t *testing.T) {
 	defer leaktest.AfterTest(t)()
 	defer log.Scope(t).Close(t)
+	skip.WithIssue(t, 148858) // has unwatched tables
 
 	testFn := func(t *testing.T, s TestServer, f cdctest.TestFeedFactory) {
 		sqlDB := sqlutils.MakeSQLRunner(s.DB)
@@ -1174,7 +1175,8 @@ func TestAlterChangefeedDatabaseScopeUnqualifiedName(t *testing.T) {
 		)
 
 		sqlDB.Exec(t, `USE movr`)
-		testFeed := feed(t, f, `CREATE CHANGEFEED FOR drivers WITH diff, resolved = '100ms'`)
+		testFeed := feed(t, f, `CREATE CHANGEFEED FOR drivers WITH diff, resolved = '100ms'`,
+			optOutOfDBLevelChangefeedUnwatchedTables)
 		defer closeFeed(t, testFeed)
 
 		assertPayloads(t, testFeed, []string{
@@ -1259,8 +1261,8 @@ func TestAlterChangefeedColumnFamilyDatabaseScope(t *testing.T) {
 }
 
 func TestAlterChangefeedAlterTableName(t *testing.T) {
-	skip.WithIssue(t, 148858) // uses non default DB
 	defer leaktest.AfterTest(t)()
+	skip.WithIssue(t, 148858) // uses non default DB
 	defer log.Scope(t).Close(t)
 
 	testFn := func(t *testing.T, s TestServer, f cdctest.TestFeedFactory) {
@@ -1490,8 +1492,8 @@ WITH resolved = '1s', no_initial_scan, min_checkpoint_frequency='1ns'`)
 }
 
 func TestAlterChangefeedAddTargetsDuringBackfill(t *testing.T) {
-	skip.WithIssue(t, 148858) // has unwatched tables
 	defer leaktest.AfterTest(t)()
+	skip.WithIssue(t, 148858) // has unwatched tables
 	defer log.Scope(t).Close(t)
 
 	var rndMu struct {
@@ -1870,8 +1872,8 @@ func TestAlterChangefeedWithOldCursorFromCreateChangefeed(t *testing.T) {
 // TestChangefeedJobControl tests if a user can modify and existing changefeed
 // based on their privileges.
 func TestAlterChangefeedAccessControl(t *testing.T) {
-	skip.WithIssue(t, 148858) // does the fancy test setup
 	defer leaktest.AfterTest(t)()
+	skip.WithIssue(t, 148858) // does the fancy test setup
 	defer log.Scope(t).Close(t)
 
 	testFn := func(t *testing.T, s TestServer, f cdctest.TestFeedFactory) {

pkg/ccl/changefeedccl/changefeed_test.go

@@ -3349,8 +3349,8 @@ WITH resolved='100ms', min_checkpoint_frequency='1ns', no_initial_scan`)
 //
 // TODO: remove this test when the legacy schema changer is  deprecated.
 func TestChangefeedSchemaChangeAllowBackfill_Legacy(t *testing.T) {
-	skip.WithIssue(t, 148858) // Also uses initial scan.
 	defer leaktest.AfterTest(t)()
+	skip.WithIssue(t, 148858) // Also uses initial scan.
 	defer log.Scope(t).Close(t)
 
 	testutils.SetVModule(t, "kv_feed=2,changefeed_processors=2")
@@ -5667,8 +5667,8 @@ func TestChangefeedResolvedNotice(t *testing.T) {
 }
 
 func TestChangefeedLowFrequencyNotices(t *testing.T) {
-	skip.WithIssue(t, 148858) // I think these notices have an issue
 	defer leaktest.AfterTest(t)()
+	skip.WithIssue(t, 148858) // I think these notices have an issue
 	defer log.Scope(t).Close(t)
 
 	cluster, _, cleanup := startTestCluster(t)
@@ -5732,8 +5732,8 @@ func TestChangefeedLowFrequencyNotices(t *testing.T) {
 //	--- FAIL: TestChangefeedOutputTopics/pubsub_v2 (0.22s)
 //	--- PASS: TestChangefeedOutputTopics/webhooks_does_not_emit_anything (0.24s)
 func TestChangefeedOutputTopics(t *testing.T) {
-	skip.WithIssue(t, 148858) // I don't know exactly what this is, could be real.
 	defer leaktest.AfterTest(t)()
+	skip.WithIssue(t, 148858) // I don't know exactly what this is, could be real.
 	defer log.Scope(t).Close(t)
 
 	cluster, _, cleanup := startTestCluster(t)
@@ -8430,8 +8430,8 @@ func TestChangefeedContinuousTelemetryDifferentJobs(t *testing.T) {
 
 // Fails: this could be something real
 func TestChangefeedHandlesDrainingNodes(t *testing.T) {
-	skip.WithIssue(t, 148858) // Doesn't use the default DB
 	defer leaktest.AfterTest(t)()
+	skip.WithIssue(t, 148858) // Doesn't use the default DB
 	defer log.Scope(t).Close(t)
 
 	skip.UnderRace(t, "Takes too long with race enabled")
@@ -8520,8 +8520,8 @@ func TestChangefeedHandlesDrainingNodes(t *testing.T) {
 // Verifies changefeed updates checkpoint when cluster undergoes rolling
 // restart.
 func TestChangefeedHandlesRollingRestart(t *testing.T) {
-	skip.WithIssue(t, 148858) // Doesn't use the default DB
 	defer leaktest.AfterTest(t)()
+	skip.WithIssue(t, 148858) // Doesn't use the default DB
 	defer log.Scope(t).Close(t)
 	defer testingUseFastRetry()()
 
@@ -9740,8 +9740,8 @@ func TestChangefeedOnErrorOption(t *testing.T) {
 }
 
 func TestDistSenderRangeFeedPopulatesVirtualTable(t *testing.T) {
-	skip.WithIssue(t, 148858) // Unwatched tables
 	defer leaktest.AfterTest(t)()
+	skip.WithIssue(t, 148858) // Unwatched tables
 	defer log.Scope(t).Close(t)
 
 	scanner := keysutil.MakePrettyScanner(nil, nil)
@@ -10020,8 +10020,8 @@ func TestChangefeedOnlyInitialScan(t *testing.T) {
 }
 
 func TestChangefeedOnlyInitialScanCSV(t *testing.T) {
-	skip.WithIssue(t, 148858) // Unwatched tables for first two cases
 	defer leaktest.AfterTest(t)()
+	skip.WithIssue(t, 148858) // Unwatched tables for first two cases
 	defer log.Scope(t).Close(t)
 
 	tests := map[string]struct {
@@ -10853,8 +10853,8 @@ func TestCreateChangefeedTelemetryLogs(t *testing.T) {
 }
 
 func TestAlterChangefeedTelemetryLogs(t *testing.T) {
-	skip.WithIssue(t, 148858) // alter and stuff
 	defer leaktest.AfterTest(t)()
+	skip.WithIssue(t, 148858) // alter and stuff
 	defer log.Scope(t).Close(t)
 
 	ctx := context.Background()
@@ -11102,8 +11102,8 @@ func TestSchemachangeDoesNotBreakSinklessFeed(t *testing.T) {
 }
 
 func TestChangefeedKafkaMessageTooLarge(t *testing.T) {
-	skip.WithIssue(t, 148858) // Unwatched tables for some
 	defer leaktest.AfterTest(t)()
+	skip.WithIssue(t, 148858) // Unwatched tables for some
 	defer log.Scope(t).Close(t)
 
 	skip.UnderDuress(t, "prone to overload")
@@ -12324,8 +12324,8 @@ WITH resolved='10ms', min_checkpoint_frequency='10ms', no_initial_scan`
 // errors while managing its protected timestamp records will increment the
 // manage PTS error counter.
 func TestChangefeedProtectedTimestampUpdateError(t *testing.T) {
-	skip.WithIssue(t, 148858) // ?
 	defer leaktest.AfterTest(t)()
+	skip.WithIssue(t, 148858) // ?
 	defer log.Scope(t).Close(t)
 
 	testFn := func(t *testing.T, s TestServer, f cdctest.TestFeedFactory) {

pkg/ccl/changefeedccl/encoder_test.go

@@ -562,8 +562,8 @@ func TestCollatedString(t *testing.T) {
 }
 
 func TestAvroEnum(t *testing.T) {
-	skip.WithIssue(t, 148858) // has the soft deletes table
 	defer leaktest.AfterTest(t)()
+	skip.WithIssue(t, 148858) // has the soft deletes table
 	defer log.Scope(t).Close(t)
 
 	testFn := func(t *testing.T, s TestServer, f cdctest.TestFeedFactory) {
@@ -788,6 +788,7 @@ func TestAvroSchemaNamespace(t *testing.T) {
 func TestAvroSchemaHasExpectedTopLevelFields(t *testing.T) {
 	defer leaktest.AfterTest(t)()
 	defer log.Scope(t).Close(t)
+	skip.WithIssue(t, 148858) // Uses non default DB
 
 	testFn := func(t *testing.T, s TestServer, f cdctest.TestFeedFactory) {
 		sqlDB := sqlutils.MakeSQLRunner(s.DB)

pkg/ccl/changefeedccl/protected_timestamps_test.go

@@ -375,8 +375,8 @@ func TestChangefeedProtectedTimestamps(t *testing.T) {
 // It verifies that we do not lose track of existing PTS records nor create
 // extraneous PTS records when altering a changefeed by adding a table.
 func TestChangefeedAlterPTS(t *testing.T) {
-	skip.WithIssue(t, 148858) // This is an issue with having too many PTS records.
 	defer leaktest.AfterTest(t)()
+	skip.WithIssue(t, 148858) // This is an issue with having too many PTS records.
 	defer log.Scope(t).Close(t)
 
 	testFn := func(t *testing.T, s TestServer, f cdctest.TestFeedFactory) {

pkg/ccl/changefeedccl/show_changefeed_jobs_test.go

@@ -657,8 +657,8 @@ func TestShowChangefeedJobsAlterChangefeed(t *testing.T) {
 }
 
 func TestShowChangefeedJobsAuthorization(t *testing.T) {
-	skip.WithIssue(t, 148858)
 	defer leaktest.AfterTest(t)()
+	skip.WithIssue(t, 148858)
 	defer log.Scope(t).Close(t)
 
 	testFn := func(t *testing.T, s TestServer, f cdctest.TestFeedFactory) {