Merge branch 'master' into make_dashboard_work

tikv · Dec 20, 2023 · d64eb18 · d64eb18
2 parents d9e888e + d98daf3
commit d64eb18
Show file tree

Hide file tree

Showing 12 changed files with 9 additions and 9 deletions.
diff --git a/Makefile b/Makefile
@@ -261,7 +261,7 @@ test-tso-consistency: install-tools
 	CGO_ENABLED=1 go test -race -tags without_dashboard,tso_consistency_test,deadlock $(TSO_INTEGRATION_TEST_PKGS) || { $(FAILPOINT_DISABLE); exit 1; }
 	@$(FAILPOINT_DISABLE)
 
-REAL_CLUSTER_TEST_PATH := $(ROOT_PATH)/tests/integrations/realtiup
+REAL_CLUSTER_TEST_PATH := $(ROOT_PATH)/tests/integrations/realcluster
 
 test-real-cluster:
 	# testing with the real cluster...

diff --git a/pd.code-workspace b/pd.code-workspace
@@ -22,7 +22,7 @@
 		},
 		{
 			"name": "real-cluster-tests",
-			"path": "tests/integrations/realtiup"
+			"path": "tests/integrations/realcluster"
 		},
 		{
 			"name": "pd-tso-bench",

diff --git a/tests/integrations/realtiup/Makefile → tests/integrations/realcluster/Makefile b/tests/integrations/realtiup/Makefile → tests/integrations/realcluster/Makefile
diff --git a/tests/integrations/realtiup/deploy.sh → tests/integrations/realcluster/deploy.sh b/tests/integrations/realtiup/deploy.sh → tests/integrations/realcluster/deploy.sh
diff --git a/tests/integrations/realtiup/go.mod → tests/integrations/realcluster/go.mod b/tests/integrations/realtiup/go.mod → tests/integrations/realcluster/go.mod
@@ -1,4 +1,4 @@
-module github.com/tikv/pd/tests/integrations/realtiup
+module github.com/tikv/pd/tests/integrations/realcluster
 
 go 1.21
 

diff --git a/tests/integrations/realtiup/go.sum → tests/integrations/realcluster/go.sum b/tests/integrations/realtiup/go.sum → tests/integrations/realcluster/go.sum
diff --git a/tests/integrations/realtiup/mock_db.go → tests/integrations/realcluster/mock_db.go b/tests/integrations/realtiup/mock_db.go → tests/integrations/realcluster/mock_db.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package realtiup
+package realcluster
 
 import (
 	"testing"

diff --git a/...s/integrations/realtiup/reboot_pd_test.go → ...ntegrations/realcluster/reboot_pd_test.go b/...s/integrations/realtiup/reboot_pd_test.go → ...ntegrations/realcluster/reboot_pd_test.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package realtiup
+package realcluster
 
 import (
 	"context"

diff --git a/...grations/realtiup/transfer_leader_test.go → ...tions/realcluster/transfer_leader_test.go b/...grations/realtiup/transfer_leader_test.go → ...tions/realcluster/transfer_leader_test.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package realtiup
+package realcluster
 
 import (
 	"context"

diff --git a/tests/integrations/realtiup/ts_test.go → tests/integrations/realcluster/ts_test.go b/tests/integrations/realtiup/ts_test.go → tests/integrations/realcluster/ts_test.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package realtiup
+package realcluster
 
 import (
 	"testing"

diff --git a/tests/integrations/realtiup/util.go → tests/integrations/realcluster/util.go b/tests/integrations/realtiup/util.go → tests/integrations/realcluster/util.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package realtiup
+package realcluster
 
 import (
 	"time"
@@ -24,7 +24,7 @@ const physicalShiftBits = 18
 
 var (
 	pdAddrs   = []string{"127.0.0.1:2379"}
-	pdHTTPCli = http.NewClient("pd-realtiup-test", pdAddrs)
+	pdHTTPCli = http.NewClient("pd-real-cluster-test", pdAddrs)
 )
 
 // GetTimeFromTS extracts time.Time from a timestamp.

diff --git a/tests/integrations/realtiup/wait_tiup.sh → tests/integrations/realcluster/wait_tiup.sh b/tests/integrations/realtiup/wait_tiup.sh → tests/integrations/realcluster/wait_tiup.sh