Skip to content

Commit

Permalink
patch in fix for test failure
Browse files Browse the repository at this point in the history
  • Loading branch information
h-vetinari committed May 21, 2024
1 parent 4839e97 commit ab6fc3d
Show file tree
Hide file tree
Showing 4 changed files with 31 additions and 6 deletions.
4 changes: 3 additions & 1 deletion recipe/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,10 @@ source:
patches:
# workaround for https://github.com/apache/arrow/issues/37692
- patches/0001-fixture-teardown-should-not-fail-test.patch
# workaround for https://github.com/conda-forge/pyarrow-feedstock/issues/117
# backport https://github.com/apache/arrow/issues/41755
- patches/0002-try-harder-to-set-up-s3_server-fixture.patch
# backport https://github.com/apache/arrow/pull/41768
- patches/0003-increase-timeout-in-TestThreadedCSVTableRead-test_ca.patch
# testing-submodule not part of release tarball
- git_url: https://github.com/apache/arrow-testing.git
git_rev: 25d16511e8d42c2744a1d94d90169e3a36e92631
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From 0ee0f802918c8627ad67c1cfb3c75d492fda8f49 Mon Sep 17 00:00:00 2001
From: "H. Vetinari" <h.vetinari@gmx.com>
Date: Wed, 13 Sep 2023 21:34:29 +1100
Subject: [PATCH 1/2] fixture teardown should not fail test
Subject: [PATCH 1/3] fixture teardown should not fail test

---
python/pyarrow/tests/test_fs.py | 10 ++++++++--
Expand Down
Original file line number Diff line number Diff line change
@@ -1,23 +1,23 @@
From 15e5b62f4fda72e255436723c60299c2092fa058 Mon Sep 17 00:00:00 2001
From 8574043686e9d149770ffa4d49482a2d53573501 Mon Sep 17 00:00:00 2001
From: "H. Vetinari" <h.vetinari@gmx.com>
Date: Thu, 9 May 2024 11:24:26 +1100
Subject: [PATCH 2/2] try harder to set up s3_server fixture
Subject: [PATCH 2/3] try harder to set up s3_server fixture

it only happens once per session, so we may as well take the time
---
python/pyarrow/tests/conftest.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/python/pyarrow/tests/conftest.py b/python/pyarrow/tests/conftest.py
index 57bc3c8fc..f9396b898 100644
index 57bc3c8fc..343b60299 100644
--- a/python/pyarrow/tests/conftest.py
+++ b/python/pyarrow/tests/conftest.py
@@ -192,7 +192,7 @@ def retry(attempts=3, delay=1.0, max_delay=None, backoff=1):

@pytest.fixture(scope='session')
def s3_server(s3_connection, tmpdir_factory):
- @retry(attempts=5, delay=0.1, backoff=2)
+ @retry(attempts=10, delay=1, backoff=2)
+ @retry(attempts=5, delay=1, backoff=2)
def minio_server_health_check(address):
resp = urllib.request.urlopen(f"http://{address}/minio/health/cluster")
assert resp.getcode() == 200
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
From 3acb5c2d0ff8c8e19749a999e88897c8a57a40aa Mon Sep 17 00:00:00 2001
From: "H. Vetinari" <h.vetinari@gmx.com>
Date: Wed, 22 May 2024 08:53:03 +1100
Subject: [PATCH 3/3] increase timeout in
TestThreadedCSVTableRead::test_cancellation

---
python/pyarrow/tests/test_csv.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/python/pyarrow/tests/test_csv.py b/python/pyarrow/tests/test_csv.py
index bc1dd8a09..9ddb5197e 100644
--- a/python/pyarrow/tests/test_csv.py
+++ b/python/pyarrow/tests/test_csv.py
@@ -1470,7 +1470,7 @@ class BaseCSVTableRead(BaseTestCSV):
pytest.fail("Failed to get an interruption during CSV reading")

# Interruption should have arrived timely
- assert last_duration <= 1.0
+ assert last_duration <= 2.0
e = exc_info.__context__
assert isinstance(e, pa.ArrowCancelled)
assert e.signum == signum

0 comments on commit ab6fc3d

Please sign in to comment.