Skip to content

ccl/multiregionccl: skip these tests just once#99484

Merged
craig[bot] merged 1 commit intocockroachdb:masterfrom
matthewtodd:un-double-skip
Mar 27, 2023
Merged

ccl/multiregionccl: skip these tests just once#99484
craig[bot] merged 1 commit intocockroachdb:masterfrom
matthewtodd:un-double-skip

Conversation

@matthewtodd
Copy link
Copy Markdown

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: [https://github.com/cockroachdb/cockroach/issues/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: [https://github.com/cockroachdb/cockroach/issues/98020]
=== CONT  TestMultiRegionDataDriven
    datadriven_test.go:428: -- test log scope end --
--- PASS: TestMultiRegionDataDriven (0.00s)
    --- SKIP: TestMultiRegionDataDriven/secondary_region (0.00s)
...

Release note: None

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
@cockroach-teamcity
Copy link
Copy Markdown
Member

This change is Reviewable

@matthewtodd matthewtodd marked this pull request as ready for review March 24, 2023 18:15
@matthewtodd matthewtodd requested review from a team and rafiss March 24, 2023 18:15
@matthewtodd
Copy link
Copy Markdown
Author

Hey, @rafiss, quick change here as I'm looking into these flakes. Would you mind taking a look?

Copy link
Copy Markdown
Collaborator

@rafiss rafiss left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

thanks, nice catch

@matthewtodd
Copy link
Copy Markdown
Author

Thanks, @rafiss!

bors r+

@craig
Copy link
Copy Markdown
Contributor

craig bot commented Mar 27, 2023

Build succeeded:

@craig craig bot merged commit a5b41ca into cockroachdb:master Mar 27, 2023
@matthewtodd matthewtodd deleted the un-double-skip branch March 27, 2023 17:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants