From f1dac396ad592c72a797523d29928b49c7037cea Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Thu, 9 May 2024 11:28:43 +1100 Subject: [PATCH] add work-around for recurring aarch failures --- recipe/meta.yaml | 2 ++ ...ixture-teardown-should-not-fail-test.patch | 8 +++---- ...y-harder-to-set-up-s3_server-fixture.patch | 23 +++++++++++++++++++ 3 files changed, 29 insertions(+), 4 deletions(-) create mode 100644 recipe/patches/0002-try-harder-to-set-up-s3_server-fixture.patch diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 73d56db..e351151 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -14,6 +14,8 @@ 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 + - patches/0002-try-harder-to-set-up-s3_server-fixture.patch # testing-submodule not part of release tarball - git_url: https://github.com/apache/arrow-testing.git git_rev: 25d16511e8d42c2744a1d94d90169e3a36e92631 diff --git a/recipe/patches/0001-fixture-teardown-should-not-fail-test.patch b/recipe/patches/0001-fixture-teardown-should-not-fail-test.patch index 343b6a9..87aa439 100644 --- a/recipe/patches/0001-fixture-teardown-should-not-fail-test.patch +++ b/recipe/patches/0001-fixture-teardown-should-not-fail-test.patch @@ -1,14 +1,14 @@ -From d1ea231aeb2daa8c742effae14e1ee9f011833c9 Mon Sep 17 00:00:00 2001 +From 0ee0f802918c8627ad67c1cfb3c75d492fda8f49 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Wed, 13 Sep 2023 21:34:29 +1100 -Subject: [PATCH 1/4] fixture teardown should not fail test +Subject: [PATCH 1/2] fixture teardown should not fail test --- python/pyarrow/tests/test_fs.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/python/pyarrow/tests/test_fs.py b/python/pyarrow/tests/test_fs.py -index d0fa253e3..de179855d 100644 +index 845f1ecce..58a73dec4 100644 --- a/python/pyarrow/tests/test_fs.py +++ b/python/pyarrow/tests/test_fs.py @@ -255,7 +255,10 @@ def s3fs(request, s3_server): @@ -23,7 +23,7 @@ index d0fa253e3..de179855d 100644 @pytest.fixture -@@ -357,7 +360,10 @@ def py_fsspec_s3fs(request, s3_server): +@@ -386,7 +389,10 @@ def py_fsspec_s3fs(request, s3_server): allow_move_dir=False, allow_append_to_file=True, ) diff --git a/recipe/patches/0002-try-harder-to-set-up-s3_server-fixture.patch b/recipe/patches/0002-try-harder-to-set-up-s3_server-fixture.patch new file mode 100644 index 0000000..7624092 --- /dev/null +++ b/recipe/patches/0002-try-harder-to-set-up-s3_server-fixture.patch @@ -0,0 +1,23 @@ +From 15e5b62f4fda72e255436723c60299c2092fa058 Mon Sep 17 00:00:00 2001 +From: "H. Vetinari" +Date: Thu, 9 May 2024 11:24:26 +1100 +Subject: [PATCH 2/2] 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 +--- 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) + def minio_server_health_check(address): + resp = urllib.request.urlopen(f"http://{address}/minio/health/cluster") + assert resp.getcode() == 200