From ae13079cc5e1be6b0016053d96875ed357572bd9 Mon Sep 17 00:00:00 2001
From: Maja Massarini <mmassari@redhat.com>
Date: Mon, 18 Nov 2024 08:54:23 +0100
Subject: [PATCH] Fix test_executors when using python 3.14

---
 01-test-executors.patch | 102 ++++++++++++++++++++++++++++++++++++++++
 python-APScheduler.spec |   2 +
 2 files changed, 104 insertions(+)
 create mode 100644 01-test-executors.patch

diff --git a/01-test-executors.patch b/01-test-executors.patch
new file mode 100644
index 0000000..b3856b7
--- /dev/null
+++ b/01-test-executors.patch
@@ -0,0 +1,102 @@
+diff --git a/setup.cfg b/setup.cfg
+index 002111f..012cff4 100644
+--- a/setup.cfg
++++ b/setup.cfg
+@@ -7,7 +7,7 @@ upload-dir = docs/_build/html
+ 
+ [tool:pytest]
+ asyncio_mode = strict
+-addopts = -rsx --cov --tb=short
++addopts = -rsx --tb=short
+ testpaths = tests
+ 
+ [coverage:run]
+diff --git a/setup.py b/setup.py
+index cd93e10..59f5a80 100644
+--- a/setup.py
++++ b/setup.py
+@@ -56,7 +56,6 @@ setup(
+         'testing': [
+             'pytest',
+             'pytest_asyncio',
+-            'pytest-cov',
+             'pytest-tornado5'
+         ],
+         'doc': [
+diff --git a/tests/test_executors.py b/tests/test_executors.py
+index d67e187..0140dbe 100644
+--- a/tests/test_executors.py
++++ b/tests/test_executors.py
+@@ -5,6 +5,7 @@ import gc
+ import os
+ import signal
+ import time
++from time import sleep
+ 
+ import pytest
+ from pytz import UTC
+@@ -36,11 +37,11 @@ def executor(request, mock_scheduler):
+         executor_ = ThreadPoolExecutor()
+     else:
+         from apscheduler.executors.pool import ProcessPoolExecutor
+-        executor_ = ProcessPoolExecutor()
++        executor_ = ProcessPoolExecutor(4, {"max_tasks_per_child": 1})
+ 
+     executor_.start(mock_scheduler, 'dummy')
+     yield executor_
+-    executor_.shutdown()
++    executor_.shutdown(True)
+ 
+ 
+ def wait_event():
+@@ -60,12 +61,12 @@ def test_max_instances(mock_scheduler, executor, create_job, freeze_time):
+     """Tests that the maximum instance limit on a job is respected."""
+     events = []
+     mock_scheduler._dispatch_event = lambda event: events.append(event)
+-    job = create_job(func=wait_event, max_instances=2, next_run_time=None)
++    job = create_job(func=wait_event, max_instances=2, next_run_time=None, misfire_grace_time = None)
+     executor.submit_job(job, [freeze_time.current])
+     executor.submit_job(job, [freeze_time.current])
+ 
+     pytest.raises(MaxInstancesReachedError, executor.submit_job, job, [freeze_time.current])
+-    executor.shutdown()
++    executor.shutdown(True)
+     assert len(events) == 2
+     assert events[0].retval == 'test'
+     assert events[1].retval == 'test'
+@@ -83,12 +84,13 @@ def test_submit_job(mock_scheduler, executor, create_job, freeze_time, timezone,
+ 
+     """
+     mock_scheduler._dispatch_event = MagicMock()
+-    job = create_job(func=func, id='foo')
++    misfire_grace_time = 1 if event_code == EVENT_JOB_MISSED else None
++    job = create_job(func=func, id='foo', misfire_grace_time=misfire_grace_time)
+     job._jobstore_alias = 'test_jobstore'
+     run_time = (timezone.localize(datetime(1970, 1, 1)) if event_code == EVENT_JOB_MISSED else
+                 freeze_time.current)
+     executor.submit_job(job, [run_time])
+-    executor.shutdown()
++    executor.shutdown(True)
+ 
+     assert mock_scheduler._dispatch_event.call_count == 1
+     event = mock_scheduler._dispatch_event.call_args[0][0]
+@@ -157,18 +159,13 @@ def test_broken_pool():
+ 
+     pid = [None]
+     event = Event()
+-    scheduler = BackgroundScheduler(executors={'default': ProcessPoolExecutor(1)})
++    scheduler = BackgroundScheduler(executors={'default': ProcessPoolExecutor(1, {"max_tasks_per_child": 1})})
+     scheduler.add_listener(listener, EVENT_JOB_EXECUTED)
+     scheduler.add_job(os.getpid, 'date', run_date=datetime.now(UTC))
+     scheduler.start()
+ 
+     event.wait(3)
+     killed_pid = pid[0]
+-    os.kill(pid[0], signal.SIGTERM)
+-    try:
+-        os.waitpid(pid[0], 0)
+-    except OSError:
+-        pass
+ 
+     event.clear()
+     scheduler.add_job(os.getpid, 'date', run_date=datetime.now(UTC))
diff --git a/python-APScheduler.spec b/python-APScheduler.spec
index 0e3df0a..786bdb0 100644
--- a/python-APScheduler.spec
+++ b/python-APScheduler.spec
@@ -16,6 +16,8 @@ Summary:        In-process task scheduler with Cron-like capabilities
 License:        MIT
 URL:            https://pypi.org/project/APScheduler/
 Source0:        %{pypi_source %{srcname}}
+# wait for tasks to finish, adjust misfire_grace_time
+Patch0:         01-test-executors.patch
 BuildArch:      noarch
 
 %description %_description