Skip to content

Commit

Permalink
Merge #99484
Browse files Browse the repository at this point in the history
99484: ccl/multiregionccl: skip these tests just once r=matthewtodd a=matthewtodd

Part of #98020.

These tests were also skipped with datadriven language out in the testdata files in #99121, so let's remove the ad-hoc skips here.

Confirming they're still skipped after this change:

```
…/cockroach (un-double-skip +) ./dev test -v pkg/ccl/multiregionccl/ -f=TestMultiRegionDataDriven/regional_by_table
...
=== RUN   TestMultiRegionDataDriven/regional_by_table
    datadriven_test.go:129: [#98020]
=== CONT  TestMultiRegionDataDriven
    datadriven_test.go:428: -- test log scope end --
--- PASS: TestMultiRegionDataDriven (0.00s)
    --- SKIP: TestMultiRegionDataDriven/regional_by_table (0.00s)
...
```

```
…/cockroach (un-double-skip +) ./dev test -v pkg/ccl/multiregionccl/ -f=TestMultiRegionDataDriven/secondary_region
...
=== RUN   TestMultiRegionDataDriven/secondary_region
    datadriven_test.go:129: [#98020]
=== CONT  TestMultiRegionDataDriven
    datadriven_test.go:428: -- test log scope end --
--- PASS: TestMultiRegionDataDriven (0.00s)
    --- SKIP: TestMultiRegionDataDriven/secondary_region (0.00s)
...
```

Release note: None

Co-authored-by: Matthew Todd <todd@cockroachlabs.com>
  • Loading branch information
craig[bot] and matthewtodd committed Mar 27, 2023
2 parents b1a20ba + 25b735e commit a5b41ca
Showing 1 changed file with 0 additions and 8 deletions.
8 changes: 0 additions & 8 deletions pkg/ccl/multiregionccl/datadriven_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -116,14 +116,6 @@ func TestMultiRegionDataDriven(t *testing.T) {
skip.UnderRace(t, "flaky test")
ctx := context.Background()
datadriven.Walk(t, datapathutils.TestDataPath(t), func(t *testing.T, path string) {

if strings.Contains(path, "regional_by_table") {
skip.WithIssue(t, 98020, "flaky test")
}
if strings.Contains(path, "secondary_region") {
skip.WithIssue(t, 92235, "flaky test")
}

ds := datadrivenTestState{}
defer ds.cleanup(ctx)
var mu syncutil.Mutex
Expand Down

0 comments on commit a5b41ca

Please sign in to comment.