diff --git a/pkg/ccl/logictestccl/tests/3node-tenant/generated_test.go b/pkg/ccl/logictestccl/tests/3node-tenant/generated_test.go index a6b4400ccd1d..e4fa95ebd12a 100644 --- a/pkg/ccl/logictestccl/tests/3node-tenant/generated_test.go +++ b/pkg/ccl/logictestccl/tests/3node-tenant/generated_test.go @@ -605,13 +605,6 @@ func TestTenantLogic_distinct_on( runLogicTest(t, "distinct_on") } -func TestTenantLogic_distsql_automatic_stats( - t *testing.T, -) { - defer leaktest.AfterTest(t)() - runLogicTest(t, "distsql_automatic_stats") -} - func TestTenantLogic_distsql_event_log( t *testing.T, ) { diff --git a/pkg/sql/logictest/testdata/logic_test/distsql_automatic_stats b/pkg/sql/logictest/testdata/logic_test/distsql_automatic_stats index f8478527d247..b2ea065543b1 100644 --- a/pkg/sql/logictest/testdata/logic_test/distsql_automatic_stats +++ b/pkg/sql/logictest/testdata/logic_test/distsql_automatic_stats @@ -1,4 +1,8 @@ -# LogicTest: !metamorphic-batch-sizes +# LogicTest: local !local !metamorphic-batch-sizes + +# TODO(yuzefovich): at the moment the tests below that assert a particular set +# of statistics are flaky, so we disable this file by using a contradictory +# config set. Once #99751 is addressed, "local !local" part should be removed. # Disable automatic stats statement ok diff --git a/pkg/sql/logictest/tests/fakedist-disk/generated_test.go b/pkg/sql/logictest/tests/fakedist-disk/generated_test.go index 67b20ec7f1c2..2f0eced5bfdd 100644 --- a/pkg/sql/logictest/tests/fakedist-disk/generated_test.go +++ b/pkg/sql/logictest/tests/fakedist-disk/generated_test.go @@ -583,13 +583,6 @@ func TestLogic_distinct_on( runLogicTest(t, "distinct_on") } -func TestLogic_distsql_automatic_stats( - t *testing.T, -) { - defer leaktest.AfterTest(t)() - runLogicTest(t, "distsql_automatic_stats") -} - func TestLogic_distsql_event_log( t *testing.T, ) { diff --git a/pkg/sql/logictest/tests/fakedist-vec-off/generated_test.go b/pkg/sql/logictest/tests/fakedist-vec-off/generated_test.go index d897cdf6cc52..23a891ed970c 100644 --- a/pkg/sql/logictest/tests/fakedist-vec-off/generated_test.go +++ b/pkg/sql/logictest/tests/fakedist-vec-off/generated_test.go @@ -583,13 +583,6 @@ func TestLogic_distinct_on( runLogicTest(t, "distinct_on") } -func TestLogic_distsql_automatic_stats( - t *testing.T, -) { - defer leaktest.AfterTest(t)() - runLogicTest(t, "distsql_automatic_stats") -} - func TestLogic_distsql_event_log( t *testing.T, ) { diff --git a/pkg/sql/logictest/tests/fakedist/generated_test.go b/pkg/sql/logictest/tests/fakedist/generated_test.go index b5ab2ecb7404..240bb47fb74c 100644 --- a/pkg/sql/logictest/tests/fakedist/generated_test.go +++ b/pkg/sql/logictest/tests/fakedist/generated_test.go @@ -583,13 +583,6 @@ func TestLogic_distinct_on( runLogicTest(t, "distinct_on") } -func TestLogic_distsql_automatic_stats( - t *testing.T, -) { - defer leaktest.AfterTest(t)() - runLogicTest(t, "distsql_automatic_stats") -} - func TestLogic_distsql_event_log( t *testing.T, ) { diff --git a/pkg/sql/logictest/tests/local-legacy-schema-changer/generated_test.go b/pkg/sql/logictest/tests/local-legacy-schema-changer/generated_test.go index 20a4224814e8..29d1dba543b7 100644 --- a/pkg/sql/logictest/tests/local-legacy-schema-changer/generated_test.go +++ b/pkg/sql/logictest/tests/local-legacy-schema-changer/generated_test.go @@ -576,13 +576,6 @@ func TestLogic_distinct_on( runLogicTest(t, "distinct_on") } -func TestLogic_distsql_automatic_stats( - t *testing.T, -) { - defer leaktest.AfterTest(t)() - runLogicTest(t, "distsql_automatic_stats") -} - func TestLogic_distsql_event_log( t *testing.T, ) { diff --git a/pkg/sql/logictest/tests/local-vec-off/generated_test.go b/pkg/sql/logictest/tests/local-vec-off/generated_test.go index 860b4ca1cf5f..553e10bb6538 100644 --- a/pkg/sql/logictest/tests/local-vec-off/generated_test.go +++ b/pkg/sql/logictest/tests/local-vec-off/generated_test.go @@ -583,13 +583,6 @@ func TestLogic_distinct_on( runLogicTest(t, "distinct_on") } -func TestLogic_distsql_automatic_stats( - t *testing.T, -) { - defer leaktest.AfterTest(t)() - runLogicTest(t, "distsql_automatic_stats") -} - func TestLogic_distsql_event_log( t *testing.T, ) { diff --git a/pkg/sql/logictest/tests/local/generated_test.go b/pkg/sql/logictest/tests/local/generated_test.go index d9220d202593..ac1a0c1aaa5d 100644 --- a/pkg/sql/logictest/tests/local/generated_test.go +++ b/pkg/sql/logictest/tests/local/generated_test.go @@ -604,13 +604,6 @@ func TestLogic_distinct_on( runLogicTest(t, "distinct_on") } -func TestLogic_distsql_automatic_stats( - t *testing.T, -) { - defer leaktest.AfterTest(t)() - runLogicTest(t, "distsql_automatic_stats") -} - func TestLogic_distsql_event_log( t *testing.T, ) {