Skip to content

Commit

Permalink
backport patch to fix a failing test
Browse files Browse the repository at this point in the history
  • Loading branch information
h-vetinari committed Aug 23, 2023
1 parent b934f69 commit 5e23014
Show file tree
Hide file tree
Showing 2 changed files with 54 additions and 2 deletions.
4 changes: 2 additions & 2 deletions recipe/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@ source:
# - url: https://github.com/apache/arrow/archive/refs/tags/apache-arrow-{{ version }}.tar.gz
- url: https://dist.apache.org/repos/dist/release/arrow/arrow-{{ version }}/apache-arrow-{{ version }}.tar.gz
sha256: 35dfda191262a756be934eef8afee8d09762cad25021daa626eb249e251ac9e6
patches:
- patches/0001-GH-15017-Python-Harden-test_memory.py-for-use-with-A.patch
# testing-submodule not part of release tarball
- git_url: https://github.com/apache/arrow-testing.git
git_rev: 47f7b56b25683202c1fd957668e13f2abafc0f12
Expand Down Expand Up @@ -369,8 +371,6 @@ outputs:
# test failures on ppc (both failing with: Float value was truncated converting to int32)
{% set tests_to_skip = tests_to_skip + " or test_safe_cast_from_float_with_nans_to_int" %} # [ppc64le]
{% set tests_to_skip = tests_to_skip + " or test_float_with_null_as_integer" %} # [ppc64le]
# "Unsupported backend 'nonexistent' specified in ARROW_DEFAULT_MEMORY_POOL"
{% set tests_to_skip = tests_to_skip + " or (test_memory and test_env_var)" %} # [unix]
# ^^^^^^^ TESTS THAT SHOULDN'T HAVE TO BE SKIPPED ^^^^^^^
- pytest -rfEs -k "not ({{ tests_to_skip }})"
{% endif %}
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
From 0ff739a0d3c8c4df4b46625f0bb0bc87c6b0d29d Mon Sep 17 00:00:00 2001
From: h-vetinari <[email protected]>
Date: Fri, 28 Jul 2023 13:31:01 +1100
Subject: [PATCH] GH-15017: [Python] Harden test_memory.py for use with
ARROW_USE_GLOG=ON (#36901)

Accept output pattern for ARROW_USE_GLOG=ON too.

* Closes: #15017

Lead-authored-by: H. Vetinari <[email protected]>
Co-authored-by: Sutou Kouhei <[email protected]>
Signed-off-by: Sutou Kouhei <[email protected]>
---
dev/tasks/conda-recipes/arrow-cpp/meta.yaml | 2 --
python/pyarrow/tests/test_memory.py | 10 ++++++++--
2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/dev/tasks/conda-recipes/arrow-cpp/meta.yaml b/dev/tasks/conda-recipes/arrow-cpp/meta.yaml
index 2f79bbe95..24c0a6ba7 100644
--- a/dev/tasks/conda-recipes/arrow-cpp/meta.yaml
+++ b/dev/tasks/conda-recipes/arrow-cpp/meta.yaml
@@ -381,8 +381,6 @@ outputs:
{% set tests_to_skip = tests_to_skip + " or test_safe_cast_from_float_with_nans_to_int" %} # [ppc64le]
# gandiva tests are segfaulting on ppc
{% set tests_to_skip = tests_to_skip + " or test_float_with_null_as_integer" %} # [ppc64le]
- # "Unsupported backend 'nonexistent' specified in ARROW_DEFAULT_MEMORY_POOL"
- {% set tests_to_skip = tests_to_skip + " or (test_memory and test_env_var)" %} # [unix]
# test is broken; header is in $PREFIX, not $SP_DIR
{% set tests_to_skip = tests_to_skip + " or (test_misc and test_get_include)" %} # [unix]
# ^^^^^^^ TESTS THAT SHOULDN'T HAVE TO BE SKIPPED ^^^^^^^
diff --git a/python/pyarrow/tests/test_memory.py b/python/pyarrow/tests/test_memory.py
index 092c50de3..d9fdeb152 100644
--- a/python/pyarrow/tests/test_memory.py
+++ b/python/pyarrow/tests/test_memory.py
@@ -134,8 +134,14 @@ def check_env_var(name, expected, *, expect_warning=False):
res.check_returncode() # fail
errlines = res.stderr.splitlines()
if expect_warning:
- assert len(errlines) == 1
- assert f"Unsupported backend '{name}'" in errlines[0]
+ assert len(errlines) in (1, 2)
+ if len(errlines) == 1:
+ # ARROW_USE_GLOG=OFF
+ assert f"Unsupported backend '{name}'" in errlines[0]
+ else:
+ # ARROW_USE_GLOG=ON
+ assert "InitGoogleLogging()" in errlines[0]
+ assert f"Unsupported backend '{name}'" in errlines[1]
else:
assert len(errlines) == 0

0 comments on commit 5e23014

Please sign in to comment.