From 9a6b6be60dc388013f15781bd7bc2d0c4119ac7f Mon Sep 17 00:00:00 2001
From: Oliver Tan <otan@cockroachlabs.com>
Date: Thu, 18 Feb 2021 21:25:08 +1100
Subject: [PATCH] multiregionccl: move regional_by_row_test to multiregionccl

This previously lived in partitionccl, but we have a new home for it
now.
Release note: None
---
 pkg/BUILD.bazel                                     |  1 +
 pkg/ccl/multiregionccl/BUILD.bazel                  | 13 +++++++++++++
 .../regional_by_row_test.go                         |  4 ++--
 pkg/ccl/partitionccl/BUILD.bazel                    |  6 ------
 4 files changed, 16 insertions(+), 8 deletions(-)
 rename pkg/ccl/{partitionccl => multiregionccl}/regional_by_row_test.go (99%)

diff --git a/pkg/BUILD.bazel b/pkg/BUILD.bazel
index a8fc4f6ccddb..a0ec37b55e0b 100644
--- a/pkg/BUILD.bazel
+++ b/pkg/BUILD.bazel
@@ -19,6 +19,7 @@ ALL_TESTS = [
     "//pkg/ccl/kvccl/kvfollowerreadsccl:kvfollowerreadsccl_test",
     "//pkg/ccl/kvccl/kvtenantccl:kvtenantccl_test",
     "//pkg/ccl/logictestccl:logictestccl_test",
+    "//pkg/ccl/multiregionccl:multiregionccl_test",
     "//pkg/ccl/oidcccl:oidcccl_test",
     "//pkg/ccl/partitionccl:partitionccl_test",
     "//pkg/ccl/serverccl:serverccl_test",
diff --git a/pkg/ccl/multiregionccl/BUILD.bazel b/pkg/ccl/multiregionccl/BUILD.bazel
index 6a6d5314fa83..f6d4006e8373 100644
--- a/pkg/ccl/multiregionccl/BUILD.bazel
+++ b/pkg/ccl/multiregionccl/BUILD.bazel
@@ -11,19 +11,32 @@ go_test(
     name = "multiregionccl_test",
     srcs = [
         "main_test.go",
+        "regional_by_row_test.go",
         "show_test.go",
     ],
     deps = [
+        "//pkg/base",
         "//pkg/ccl/partitionccl",
         "//pkg/ccl/utilccl",
+        "//pkg/jobs",
+        "//pkg/keys",
+        "//pkg/roachpb",
         "//pkg/security",
         "//pkg/security/securitytest",
         "//pkg/server",
+        "//pkg/sql",
+        "//pkg/sql/catalog/catalogkv",
+        "//pkg/sql/execinfra",
         "//pkg/sql/sqltestutils",
+        "//pkg/sql/tests",
+        "//pkg/testutils",
         "//pkg/testutils/serverutils",
         "//pkg/testutils/testcluster",
+        "//pkg/util",
         "//pkg/util/leaktest",
         "//pkg/util/log",
         "//pkg/util/randutil",
+        "@com_github_cockroachdb_errors//:errors",
+        "@com_github_stretchr_testify//require",
     ],
 )
diff --git a/pkg/ccl/partitionccl/regional_by_row_test.go b/pkg/ccl/multiregionccl/regional_by_row_test.go
similarity index 99%
rename from pkg/ccl/partitionccl/regional_by_row_test.go
rename to pkg/ccl/multiregionccl/regional_by_row_test.go
index 1c5d96a3156a..0fdf86aafd63 100644
--- a/pkg/ccl/partitionccl/regional_by_row_test.go
+++ b/pkg/ccl/multiregionccl/regional_by_row_test.go
@@ -6,7 +6,7 @@
 //
 //     https://github.com/cockroachdb/cockroach/blob/master/licenses/CCL.txt
 
-package partitionccl_test
+package multiregionccl_test
 
 import (
 	"context"
@@ -32,7 +32,7 @@ import (
 	"github.com/stretchr/testify/require"
 )
 
-// REGIONAL BY ROW tests are defined in partitionccl as REGIONAL BY ROW
+// REGIONAL BY ROW tests are defined in multiregionccl as REGIONAL BY ROW
 // requires CCL to operate.
 
 // TestAlterTableLocalityRegionalByRowError tests an alteration involving
diff --git a/pkg/ccl/partitionccl/BUILD.bazel b/pkg/ccl/partitionccl/BUILD.bazel
index 145fc80ed620..b3cce6124459 100644
--- a/pkg/ccl/partitionccl/BUILD.bazel
+++ b/pkg/ccl/partitionccl/BUILD.bazel
@@ -32,7 +32,6 @@ go_test(
         "drop_test.go",
         "main_test.go",
         "partition_test.go",
-        "regional_by_row_test.go",
         "zone_test.go",
     ],
     embed = [":partitionccl"],
@@ -43,7 +42,6 @@ go_test(
         "//pkg/ccl/utilccl",
         "//pkg/config",
         "//pkg/config/zonepb",
-        "//pkg/jobs",
         "//pkg/keys",
         "//pkg/kv/kvserver",
         "//pkg/roachpb",
@@ -55,12 +53,10 @@ go_test(
         "//pkg/sql/catalog/catalogkv",
         "//pkg/sql/catalog/descpb",
         "//pkg/sql/catalog/tabledesc",
-        "//pkg/sql/execinfra",
         "//pkg/sql/gcjob",
         "//pkg/sql/parser",
         "//pkg/sql/rowenc",
         "//pkg/sql/sem/tree",
-        "//pkg/sql/sqltestutils",
         "//pkg/sql/tests",
         "//pkg/sql/types",
         "//pkg/testutils",
@@ -68,7 +64,6 @@ go_test(
         "//pkg/testutils/skip",
         "//pkg/testutils/sqlutils",
         "//pkg/testutils/testcluster",
-        "//pkg/util",
         "//pkg/util/encoding",
         "//pkg/util/hlc",
         "//pkg/util/leaktest",
@@ -78,7 +73,6 @@ go_test(
         "//pkg/util/uuid",
         "@com_github_cockroachdb_errors//:errors",
         "@com_github_gogo_protobuf//proto",
-        "@com_github_stretchr_testify//require",
         "@in_gopkg_yaml_v2//:yaml_v2",
     ],
 )