Merge #105587

105587: testcluster: unskip no longer flaky test r=yuzefovich a=yuzefovich `TestRestart` appears to not be flaky anymore. See #104740 (comment) for more details. Fixes: #104740. Release note: None Co-authored-by: Yahor Yuzefovich <[email protected]>
cockroachdb · Jun 26, 2023 · 961a2e6 · 961a2e6
2 parents 5b9824f + a1bfbd7
commit 961a2e6
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 3 deletions.
diff --git a/pkg/testutils/testcluster/BUILD.bazel b/pkg/testutils/testcluster/BUILD.bazel
@@ -64,7 +64,6 @@ go_test(
         "//pkg/sql/catalog/desctestutils",
         "//pkg/testutils",
         "//pkg/testutils/serverutils",
-        "//pkg/testutils/skip",
         "//pkg/testutils/sqlutils",
         "//pkg/util/httputil",
         "//pkg/util/leaktest",

diff --git a/pkg/testutils/testcluster/testcluster_test.go b/pkg/testutils/testcluster/testcluster_test.go
@@ -26,7 +26,6 @@ import (
 	"github.com/cockroachdb/cockroach/pkg/server/serverpb"
 	"github.com/cockroachdb/cockroach/pkg/sql/catalog/desctestutils"
 	"github.com/cockroachdb/cockroach/pkg/testutils"
-	"github.com/cockroachdb/cockroach/pkg/testutils/skip"
 	"github.com/cockroachdb/cockroach/pkg/testutils/sqlutils"
 	"github.com/cockroachdb/cockroach/pkg/util/httputil"
 	"github.com/cockroachdb/cockroach/pkg/util/leaktest"
@@ -273,7 +272,6 @@ func TestStopServer(t *testing.T) {
 
 func TestRestart(t *testing.T) {
 	defer leaktest.AfterTest(t)()
-	skip.WithIssue(t, 104740)
 
 	stickyEngineRegistry := server.NewStickyInMemEnginesRegistry()
 	defer stickyEngineRegistry.CloseAllStickyInMemEngines()