From 43f910fe57476275abb16ae554acf1ba1dd2e840 Mon Sep 17 00:00:00 2001 From: Thomas Li <47963215+lithomas1@users.noreply.github.com> Date: Tue, 20 Jul 2021 11:02:00 -0700 Subject: [PATCH 1/3] Update run_tests.sh --- ci/run_tests.sh | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/ci/run_tests.sh b/ci/run_tests.sh index 0d6f26d8c29f8..77573a6286417 100755 --- a/ci/run_tests.sh +++ b/ci/run_tests.sh @@ -30,7 +30,10 @@ fi echo $PYTEST_CMD sh -c "$PYTEST_CMD" -PYTEST_AM_CMD="PANDAS_DATA_MANAGER=array pytest -m \"$PATTERN and arraymanager\" -n $PYTEST_WORKERS --dist=loadfile $TEST_ARGS $COVERAGE pandas" +if [[ $(PANDAS_DATA_MANAGER) != "array"]]; then + # The ArrayManager tests should have already been run by PYTEST_CMD if PANDAS_DATA_MANAGER was already set to array + PYTEST_AM_CMD="PANDAS_DATA_MANAGER=array pytest -m \"$PATTERN and arraymanager\" -n $PYTEST_WORKERS --dist=loadfile $TEST_ARGS $COVERAGE pandas" -echo $PYTEST_AM_CMD -sh -c "$PYTEST_AM_CMD" + echo $PYTEST_AM_CMD + sh -c "$PYTEST_AM_CMD" +fi From 6b48128459ecf179b0b5d29d42f5f1eecded617d Mon Sep 17 00:00:00 2001 From: Thomas Li <47963215+lithomas1@users.noreply.github.com> Date: Tue, 20 Jul 2021 13:47:13 -0700 Subject: [PATCH 2/3] typo? --- ci/run_tests.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/run_tests.sh b/ci/run_tests.sh index 77573a6286417..d4eadb1272586 100755 --- a/ci/run_tests.sh +++ b/ci/run_tests.sh @@ -30,7 +30,7 @@ fi echo $PYTEST_CMD sh -c "$PYTEST_CMD" -if [[ $(PANDAS_DATA_MANAGER) != "array"]]; then +if [[ $(PANDAS_DATA_MANAGER) != "array" ]]; then # The ArrayManager tests should have already been run by PYTEST_CMD if PANDAS_DATA_MANAGER was already set to array PYTEST_AM_CMD="PANDAS_DATA_MANAGER=array pytest -m \"$PATTERN and arraymanager\" -n $PYTEST_WORKERS --dist=loadfile $TEST_ARGS $COVERAGE pandas" From e2d9249ea85966a808dc831a633f2ac411b6a681 Mon Sep 17 00:00:00 2001 From: Thomas Li <47963215+lithomas1@users.noreply.github.com> Date: Tue, 20 Jul 2021 17:26:32 -0700 Subject: [PATCH 3/3] typo? --- ci/run_tests.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/run_tests.sh b/ci/run_tests.sh index d4eadb1272586..8304b89499465 100755 --- a/ci/run_tests.sh +++ b/ci/run_tests.sh @@ -30,7 +30,7 @@ fi echo $PYTEST_CMD sh -c "$PYTEST_CMD" -if [[ $(PANDAS_DATA_MANAGER) != "array" ]]; then +if [[ "$PANDAS_DATA_MANAGER" != "array" ]]; then # The ArrayManager tests should have already been run by PYTEST_CMD if PANDAS_DATA_MANAGER was already set to array PYTEST_AM_CMD="PANDAS_DATA_MANAGER=array pytest -m \"$PATTERN and arraymanager\" -n $PYTEST_WORKERS --dist=loadfile $TEST_ARGS $COVERAGE pandas"