Merge #59166 #59181

59166: acceptance: skip TestDocker* flaky tests r=RaduBerinde a=RaduBerinde These tests all flake with the same failure. Informs #58955. Release note: None 59181: server: skip TestMigrationPurgeOutdatedReplicas r=irfansharif a=RaduBerinde Informs #59180. Release note: None Co-authored-by: Radu Berinde <[email protected]>
cockroachdb · Jan 20, 2021 · 3d01fda · 3d01fda
3 parents a9a0f71 + ce74986 + e2a7211
commit 3d01fda
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/pkg/acceptance/adapter_test.go b/pkg/acceptance/adapter_test.go
@@ -49,6 +49,7 @@ func TestDockerCSharp(t *testing.T) {
 }
 
 func TestDockerJava(t *testing.T) {
+	skip.WithIssue(t, 58955, "flaky test")
 	s := log.Scope(t)
 	defer s.Close(t)
 
@@ -69,6 +70,7 @@ func TestDockerElixir(t *testing.T) {
 }
 
 func TestDockerNodeJS(t *testing.T) {
+	skip.WithIssue(t, 58955, "flaky test")
 	s := log.Scope(t)
 	defer s.Close(t)
 
@@ -97,6 +99,7 @@ func TestDockerPHP(t *testing.T) {
 }
 
 func TestDockerPSQL(t *testing.T) {
+	skip.WithIssue(t, 58955, "flaky test")
 	s := log.Scope(t)
 	defer s.Close(t)
 

diff --git a/pkg/server/migration_test.go b/pkg/server/migration_test.go
@@ -23,6 +23,7 @@ import (
 	"github.com/cockroachdb/cockroach/pkg/settings/cluster"
 	"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/util/leaktest"
 )
 
@@ -200,6 +201,7 @@ func TestBumpClusterVersion(t *testing.T) {
 
 func TestMigrationPurgeOutdatedReplicas(t *testing.T) {
 	defer leaktest.AfterTest(t)()
+	skip.WithIssue(t, 59180)
 
 	const numStores = 3
 	var storeSpecs []base.StoreSpec