From 2f1d8fe679a5b2bb157cb8190bee0fa2ef7bae5d Mon Sep 17 00:00:00 2001 From: Jorge Leitao Date: Tue, 31 Aug 2021 19:31:06 +0100 Subject: [PATCH] Made IPC integration tests run tests that are not run by arrow-rs (#278) --- .github/workflows/integration-ipc.yml | 3 ++ integration-testing/Cargo.toml | 2 +- integration-testing/unskip.patch | 40 +++++++++++++++++++++++++++ 3 files changed, 44 insertions(+), 1 deletion(-) create mode 100644 integration-testing/unskip.patch diff --git a/.github/workflows/integration-ipc.yml b/.github/workflows/integration-ipc.yml index 7e55395b366..acea8b0a409 100644 --- a/.github/workflows/integration-ipc.yml +++ b/.github/workflows/integration-ipc.yml @@ -25,6 +25,9 @@ jobs: # which is incompatible with this. Let's monkey patch it - name: Fix compilation run: cp rust/integration-testing/rust_build.sh ci/scripts/rust_build.sh + # unskip many of the tests + - name: Test more cases + run: git apply rust/integration-testing/unskip.patch - name: Setup Python uses: actions/setup-python@v1 with: diff --git a/integration-testing/Cargo.toml b/integration-testing/Cargo.toml index f2c6e31d229..e07ae2c141f 100644 --- a/integration-testing/Cargo.toml +++ b/integration-testing/Cargo.toml @@ -30,7 +30,7 @@ publish = false logging = ["tracing-subscriber"] [dependencies] -arrow2 = { path = "../", features = ["io_ipc", "io_json_integration"], default-features = false } +arrow2 = { path = "../", features = ["io_ipc", "io_ipc_compression", "io_json_integration"], default-features = false } arrow-flight = { path = "../arrow-flight" } async-trait = "0.1.41" clap = "2.33" diff --git a/integration-testing/unskip.patch b/integration-testing/unskip.patch new file mode 100644 index 00000000000..fb84d7d94d2 --- /dev/null +++ b/integration-testing/unskip.patch @@ -0,0 +1,40 @@ +diff --git a/dev/archery/archery/integration/datagen.py b/dev/archery/archery/integration/datagen.py +index d0c4b3d6c..bc4b83e68 100644 +--- a/dev/archery/archery/integration/datagen.py ++++ b/dev/archery/archery/integration/datagen.py +@@ -1568,8 +1568,7 @@ def get_generated_json_files(tempdir=None): + .skip_category('Go') # TODO(ARROW-7901) + .skip_category('JS'), # TODO(ARROW-7900) + +- generate_decimal128_case() +- .skip_category('Rust'), ++ generate_decimal128_case(), + + generate_decimal256_case() + .skip_category('Go') # TODO(ARROW-7948): Decimal + Go +@@ -1579,8 +1578,7 @@ def get_generated_json_files(tempdir=None): + generate_datetime_case(), + + generate_interval_case() +- .skip_category('JS') # TODO(ARROW-5239): Intervals + JS +- .skip_category('Rust'), ++ .skip_category('JS'), # TODO(ARROW-5239): Intervals + JS + + generate_month_day_nano_interval_case() + .skip_category('Go') +@@ -1603,13 +1601,11 @@ def get_generated_json_files(tempdir=None): + + generate_nested_large_offsets_case() + .skip_category('Go') +- .skip_category('JS') +- .skip_category('Rust'), ++ .skip_category('JS'), + + generate_unions_case() + .skip_category('Go') +- .skip_category('JS') +- .skip_category('Rust'), ++ .skip_category('JS'), + + generate_custom_metadata_case() + .skip_category('JS'),