Skip to content

Commit fc145ed

Browse files
author
Trong Nhan Mai
committed
chore: remove integration tests shell scripts and use the new utility script in Makefile
Signed-off-by: Trong Nhan Mai <[email protected]>
1 parent 8278dce commit fc145ed

File tree

3 files changed

+23
-141
lines changed

3 files changed

+23
-141
lines changed

Makefile

Lines changed: 23 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -298,16 +298,36 @@ test-go:
298298
# Note: to disable npm tests set `NO_NPM` environment variable to `TRUE`.
299299
.PHONY: integration-test
300300
integration-test:
301-
scripts/dev_scripts/integration_tests.sh $(REPO_PATH) "${HOME}"
301+
if [ "${NO_NPM}" == "TRUE" ]; then \
302+
echo "Note: NO_NPM environment variable is set to TRUE, so npm tests will be skipped."; \
303+
python ./tests/integration/run.py \
304+
run \
305+
--exclude-tag docker-only \
306+
--exclude-tag skip \
307+
--exclude-tag npm-registry \
308+
./tests/integration/cases/...; \
309+
else \
310+
python ./tests/integration/run.py \
311+
run \
312+
--exclude-tag docker-only \
313+
--exclude-tag skip \
314+
./tests/integration/cases/...; \
315+
fi
302316

303317
.PHONY: integration-test-docker
304318
integration-test-docker:
305-
scripts/dev_scripts/integration_tests_docker.sh $(REPO_PATH) scripts/release_scripts/run_macaron.sh
319+
python ./tests/integration/run.py \
320+
run \
321+
--macaron scripts/release_scripts/run_macaron.sh \
322+
--include-tag shared-docker-python \
323+
./tests/integration/cases/...
306324

307325
# Update the expected results of the integration tests after generating the actual results.
308326
.PHONY: integration-test-update
309327
integration-test-update:
310-
scripts/dev_scripts/integration_tests.sh $(REPO_PATH) "${HOME}" "--update"
328+
python ./tests/integration/run.py \
329+
update \
330+
./tests/integration/cases/...
311331

312332
# Build a source distribution package and a binary wheel distribution artifact.
313333
# When building these artifacts, we need the environment variable SOURCE_DATE_EPOCH

scripts/dev_scripts/integration_tests.sh

Lines changed: 0 additions & 94 deletions
This file was deleted.

scripts/dev_scripts/integration_tests_docker.sh

Lines changed: 0 additions & 44 deletions
This file was deleted.

0 commit comments

Comments
 (0)