spanconfigccl: fix tests under multitenancy #107760
Conversation
|
This change is |
There was a problem hiding this comment.
Also, take a look at TestTODOTestTenantDisabled in case you can remove some files from the allowlist.
Reviewed 2 of 2 files at r1, all commit messages.
Reviewable status:complete! 1 of 0 LGTMs obtained (waiting on @rafiss)
pkg/ccl/spanconfigccl/spanconfigsqlwatcherccl/sqlwatcher_test.go line 290 at r1 (raw file):
tc := testcluster.StartTestCluster(t, 1, base.TestClusterArgs{ ServerArgs: base.TestServerArgs{ DefaultTestTenant: base.TestTenantProbabilisticOnly,
nit: you can omit specifying DefaultTestTenant since "probabilistic only" is the default.
pkg/ccl/spanconfigccl/spanconfigsqlwatcherccl/sqlwatcher_test.go line 308 at r1 (raw file):
noopCheckpointDuration := 100 * time.Millisecond sqlWatcher := spanconfigsqlwatcher.New( ts.TenantOrServer().Codec(),
nit: FYI TenantOrServer() is being renamed to ApplicationLayer() over in #107612.
There was a problem hiding this comment.
*at TestTODOTestTenantDisabled linter.
Reviewable status:
rafiss
force-pushed
the
deflake-spanconfig-tests
branch
from
44c8346 to
d57d663
Compare
There was a problem hiding this comment.
hm, nothing in spanconfigccl is excluded from that linter at all, so i'm not sure why the linter was passing before. tftr!
bors r=yuzefovich
Reviewable status:
pkg/ccl/spanconfigccl/spanconfigsqlwatcherccl/sqlwatcher_test.go line 290 at r1 (raw file):
Previously, yuzefovich (Yahor Yuzefovich) wrote…
nit: you can omit specifying
DefaultTestTenantsince "probabilistic only" is the default.
done
|
ah i see #107612 is merging right now bors r- |
|
Canceled. |
| @@ -119,7 +113,8 @@ func TestDataDriven(t *testing.T) { | |||
| var dbName, tbName string | |||
| d.ScanArgs(t, "database", &dbName) | |||
| d.ScanArgs(t, "table", &tbName) | |||
| objID = tenant.LookupTableByName(ctx, dbName, tbName).GetID() | |||
| tbl := tenant.LookupTableByName(ctx, dbName, tbName) | |||
| objID = tbl.GetID() | |||
There was a problem hiding this comment.
nit: Jake introduced a method .QueryTableID() which might be relevant here.
Release note: None
rafiss
force-pushed
the
deflake-spanconfig-tests
branch
from
d57d663 to
ee028ba
Compare
|
bors r=yuzefovich |
|
This PR was included in a batch that timed out, it will be automatically retried |
|
Build failed (retrying...): |
|
Build succeeded: |
|
Encountered an error creating backports. Some common things that can go wrong:
You might need to create your backport manually using the backport tool. error creating merge commit from ee028ba to blathers/backport-release-23.1-107760: POST https://api.github.com/repos/cockroachdb/cockroach/merges: 409 Merge conflict [] you may need to manually resolve merge conflicts with the backport tool. Backport to branch 23.1.x failed. See errors above. 🦉 Hoot! I am a Blathers, a bot for CockroachDB. My owner is dev-inf. |
The linter is specific to |
fixes #106818
fixes #106821
Release note: None