Skip to content

Tidy up test cases for clustered index (#1599) #1603

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ti-srebot merged 3 commits into from
Mar 22, 2021
Merged

Tidy up test cases for clustered index (#1599) #1603

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3fec6d4
cherry pick #1599 to release-5.0
JaySon-Huang Mar 20, 2021
9677e36
Merge branch 'release-5.0' into release-5.0-f20dfc6a3b8f
ti-srebot Mar 22, 2021
bd1531f
Merge branch 'release-5.0' into release-5.0-f20dfc6a3b8f
ti-srebot Mar 22, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions tests/_env.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ if [ `uname` == "Darwin" ]; then
else
export build_dir="../../build"
fi
# export build_dir="../cmake-build-debug"

export storage_bin="$build_dir/dbms/src/Server/tiflash"

Expand Down Expand Up @@ -39,5 +40,5 @@ export verbose="false"
# export verbose="true"

# Setup running env vars
source ../../_vars.sh
setup_dylib_path
#source ../../_vars.sh
#setup_dylib_path
57 changes: 0 additions & 57 deletions tests/docker/cluster_clustered_index.yaml
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion tests/docker/config/tidb_new_collation.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
# TiDB Configuration.

host = "0.0.0.0"
alter-primary-key = true
new_collations_enabled_on_first_bootstrap = true
9 changes: 7 additions & 2 deletions tests/docker/run.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,12 @@ fi


# Stop all docker instances if exist.
docker-compose -f gtest.yaml -f cluster.yaml -f cluster_new_collation.yaml -f cluster_clustered_index.yaml -f tiflash-dt.yaml -f mock-test-dt.yaml \
docker-compose \
-f gtest.yaml \
-f cluster.yaml \
-f cluster_new_collation.yaml \
-f tiflash-dt.yaml \
-f mock-test-dt.yaml \
-f cluster_tidb_fail_point.yaml \
down

Expand Down Expand Up @@ -93,7 +98,7 @@ rm -rf ./data ./log
# run fullstack-tests (for engine DeltaTree)
docker-compose -f cluster.yaml -f tiflash-dt.yaml up -d
wait_env dt
docker-compose -f cluster.yaml -f tiflash-dt.yaml exec -T tiflash0 bash -c 'cd /tests ; ./run-test.sh fullstack-test true && ./run-test.sh fullstack-test-dt && ./run-test.sh clustered_index_fullstack'
docker-compose -f cluster.yaml -f tiflash-dt.yaml exec -T tiflash0 bash -c 'cd /tests ; ./run-test.sh fullstack-test true && ./run-test.sh fullstack-test-dt'
docker-compose -f cluster.yaml -f tiflash-dt.yaml down
rm -rf ./data ./log

Expand Down
0 .../clustered_index_fullstack/data_type.test → ...ck-test-dt/clustered_index/data_type.test
View file
Open in desktop
File renamed without changes.
0 tests/clustered_index_fullstack/ddl.test → ...ullstack-test-dt/clustered_index/ddl.test
View file
Open in desktop
File renamed without changes.
0 ...clustered_index_fullstack/issue_1514.test → ...k-test-dt/clustered_index/issue_1514.test
View file
Open in desktop
File renamed without changes.
0 tests/clustered_index_fullstack/query.test → ...lstack-test-dt/clustered_index/query.test
View file
Open in desktop
File renamed without changes.