Skip to content

Commit

Permalink
Merge #60729
Browse files Browse the repository at this point in the history
60729: ccl/backupccl: skip TestSerializesScheduledBackupExecutionArgs under race. r=adityamaru a=adityamaru


Refs: #60718

Reason: flaky test

Generated by bin/skip-test.

Release justification: non-production code changes

Release note: None

Co-authored-by: Aditya Maru <adityamaru@gmail.com>
  • Loading branch information
craig[bot] and adityamaru committed Feb 18, 2021
2 parents 8b14771 + 4c5449f commit 280ead9
Showing 1 changed file with 2 additions and 0 deletions.
2 changes: 2 additions & 0 deletions pkg/ccl/backupccl/create_scheduled_backup_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ import (
"github.com/cockroachdb/cockroach/pkg/sql/sessiondata"
"github.com/cockroachdb/cockroach/pkg/testutils"
"github.com/cockroachdb/cockroach/pkg/testutils/serverutils"
"github.com/cockroachdb/cockroach/pkg/testutils/skip"
"github.com/cockroachdb/cockroach/pkg/testutils/sqlutils"
"github.com/cockroachdb/cockroach/pkg/util/leaktest"
"github.com/cockroachdb/cockroach/pkg/util/log"
Expand Down Expand Up @@ -180,6 +181,7 @@ func (t userType) String() string {
// itself with the actual scheduling and the execution of those backups.
func TestSerializesScheduledBackupExecutionArgs(t *testing.T) {
defer leaktest.AfterTest(t)()
skip.UnderRaceWithIssue(t, 60718, "flaky test")
defer log.Scope(t).Close(t)

th, cleanup := newTestHelper(t)
Expand Down

0 comments on commit 280ead9

Please sign in to comment.