Merge cockroachdb#59451

59451: ccl/storageccl: skip TestEncryptDecrypt under race r=pbardea a=adityamaru Refs: cockroachdb#59417 Reason: flaky test Generated by bin/skip-test. Release justification: non-production code changes Release note: None Co-authored-by: Aditya Maru <[email protected]>
ajwerner · Jan 27, 2021 · a36c594 · a36c594
2 parents f7c5898 + 81346bc
commit a36c594
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 0 deletions.
diff --git a/pkg/ccl/storageccl/BUILD.bazel b/pkg/ccl/storageccl/BUILD.bazel
@@ -78,6 +78,7 @@ go_test(
         "//pkg/storage/enginepb",
         "//pkg/testutils",
         "//pkg/testutils/serverutils",
+        "//pkg/testutils/skip",
         "//pkg/testutils/sqlutils",
         "//pkg/testutils/testcluster",
         "//pkg/util/encoding",

diff --git a/pkg/ccl/storageccl/encryption_test.go b/pkg/ccl/storageccl/encryption_test.go
@@ -15,6 +15,7 @@ import (
 	"io/ioutil"
 	"testing"
 
+	"github.com/cockroachdb/cockroach/pkg/testutils/skip"
 	"github.com/cockroachdb/cockroach/pkg/util/humanizeutil"
 	"github.com/cockroachdb/cockroach/pkg/util/leaktest"
 	"github.com/cockroachdb/cockroach/pkg/util/randutil"
@@ -23,6 +24,7 @@ import (
 
 func TestEncryptDecrypt(t *testing.T) {
 	defer leaktest.AfterTest(t)()
+	skip.UnderRaceWithIssue(t, 59417, "flaky test")
 
 	passphrase := []byte("this is a a key")
 	salt, err := GenerateSalt()