Skip to content

Commit 8cc8215

Browse files
ARROW-7751: [Release] macOS wheel verification also needs arrow-testing
This addition follows the pattern of `test_source_distribution` (as it is in #6344). There are also two error message patches to make them consistent with everywhere else that references this env var (though FWIW `testing/data` is still not correct in the verification script, it's `arrow-testing/data` 🤷‍♂). Closes #6345 from nealrichardson/flight-testing-data and squashes the following commits: a29e88a <Krisztián Szűcs> factor out testing repository cloning df9ef25 <Neal Richardson> Move addition and fix lint e165d54 <Neal Richardson> Make sure macOS wheel verification has test data Lead-authored-by: Neal Richardson <neal.p.richardson@gmail.com> Co-authored-by: Krisztián Szűcs <szucs.krisztian@gmail.com> Signed-off-by: Krisztián Szűcs <szucs.krisztian@gmail.com>
1 parent e320b4c commit 8cc8215

File tree

3 files changed

+18
-11
lines changed

3 files changed

+18
-11
lines changed

cpp/src/arrow/flight/test_util.cc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -454,7 +454,8 @@ Status TestClientBasicAuthHandler::GetToken(std::string* token) {
454454
Status GetTestResourceRoot(std::string* out) {
455455
const char* c_root = std::getenv("ARROW_TEST_DATA");
456456
if (!c_root) {
457-
return Status::IOError("Test resources not found, set ARROW_TEST_DATA");
457+
return Status::IOError(
458+
"Test resources not found, set ARROW_TEST_DATA to <repo root>/testing/data");
458459
}
459460
*out = std::string(c_root);
460461
return Status::OK();

dev/release/verify-release-candidate.sh

Lines changed: 15 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -522,6 +522,18 @@ test_integration() {
522522
$INTEGRATION_TEST_ARGS
523523
}
524524

525+
clone_testing_repositories() {
526+
# Clone testing repositories if not cloned already
527+
if [ ! -d "arrow-testing" ]; then
528+
git clone https://github.com/apache/arrow-testing.git
529+
fi
530+
if [ ! -d "parquet-testing" ]; then
531+
git clone https://github.com/apache/parquet-testing.git
532+
fi
533+
export ARROW_TEST_DATA=$PWD/arrow-testing/data
534+
export PARQUET_TEST_DATA=$PWD/parquet-testing/data
535+
}
536+
525537
test_source_distribution() {
526538
export ARROW_HOME=$TMPDIR/install
527539
export PARQUET_HOME=$TMPDIR/install
@@ -534,15 +546,7 @@ test_source_distribution() {
534546
NPROC=$(nproc)
535547
fi
536548

537-
# Clone testing repositories if not cloned already
538-
if [ ! -d "arrow-testing" ]; then
539-
git clone https://github.com/apache/arrow-testing.git
540-
fi
541-
if [ ! -d "parquet-testing" ]; then
542-
git clone https://github.com/apache/parquet-testing.git
543-
fi
544-
export ARROW_TEST_DATA=$PWD/arrow-testing/data
545-
export PARQUET_TEST_DATA=$PWD/parquet-testing/data
549+
clone_testing_repositories
546550

547551
if [ ${TEST_JAVA} -gt 0 ]; then
548552
test_package_java
@@ -668,6 +672,8 @@ test_macos_wheels() {
668672
}
669673

670674
test_wheels() {
675+
clone_testing_repositories
676+
671677
local download_dir=binaries
672678
mkdir -p ${download_dir}
673679

python/pyarrow/tests/test_flight.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ def resource_root():
6060
"""Get the path to the test resources directory."""
6161
if not os.environ.get("ARROW_TEST_DATA"):
6262
raise RuntimeError("Test resources not found; set "
63-
"ARROW_TEST_DATA to <repo root>/testing")
63+
"ARROW_TEST_DATA to <repo root>/testing/data")
6464
return pathlib.Path(os.environ["ARROW_TEST_DATA"]) / "flight"
6565

6666

0 commit comments

Comments
 (0)