test: pass SENTRY_PYTHON_TEST_REDIS_HOST through tox

The workflow sets SENTRY_PYTHON_TEST_REDIS_HOST=redis for 3.6/3.7
container runs (since redis is a sibling service container, not on
loopback), but tox strips env vars not listed in passenv. The celery
beat tests therefore read the default 127.0.0.1, find nothing on
loopback inside the python container, and hang in kombu's
retry_over_time. Adding the var to passenv fixes it; un-skip the beat
tests on py3.7.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>

Author: sl0thentr0py

scripts/populate_tox/config.py

@@ -73,7 +73,7 @@
         "deps": {
             "*": ["newrelic<10.17.0", "redis"],
             "py3.6": ["newrelic<8"],
-            "py3.7": ["importlib-metadata<5.0", "pytest-timeout"],
+            "py3.7": ["importlib-metadata<5.0"],
         },
     },
     "chalice": {

scripts/populate_tox/tox.jinja

@@ -198,10 +198,6 @@ setenv =
     common: PYTEST_ADDOPTS="--ignore=tests/test_shadowed_module.py"
     gevent: PYTEST_ADDOPTS="--ignore=tests/test_shadowed_module.py"
 
-    # Debug CI hangs for celery on py3.7: dump tracebacks and fail the test
-    # rather than letting the job time out at the workflow level.
-    py3.7-celery: PYTEST_ADDOPTS=--timeout=120 --timeout-method=thread
-
     # TESTPATH definitions for test suites not managed by toxgen
     common: _TESTPATH=tests
     gevent: _TESTPATH=tests
@@ -226,6 +222,7 @@ passenv =
     SENTRY_PYTHON_TEST_POSTGRES_USER
     SENTRY_PYTHON_TEST_POSTGRES_PASSWORD
     SENTRY_PYTHON_TEST_POSTGRES_NAME
+    SENTRY_PYTHON_TEST_REDIS_HOST
     TESTPATH
 
 basepython =

tests/integrations/celery/integration_tests/__init__.py

@@ -24,20 +24,11 @@ def tick(self):
         return 1
 
 
-def kill_beat(beat_pid_file, delay_seconds=1, pidfile_timeout=30):
+def kill_beat(beat_pid_file, delay_seconds=1):
     """
-    Terminates Celery Beat after `delay_seconds` of beat-runtime.
-
-    Waits up to `pidfile_timeout` seconds for the pidfile to appear before
-    starting the runtime timer, so slow process startup doesn't race the
-    killer into a FileNotFoundError that would leak a running beat.
+    Terminates Celery Beat after the given `delay_seconds`.
     """
     logger.info("Starting Celery Beat killer...")
-    deadline = time.monotonic() + pidfile_timeout
-    while not os.path.exists(beat_pid_file):
-        if time.monotonic() > deadline:
-            raise RuntimeError("Celery Beat pidfile %s never appeared" % beat_pid_file)
-        time.sleep(0.05)
     time.sleep(delay_seconds)
     pid = int(open(beat_pid_file, "r").read())
     logger.info("Terminating Celery Beat...")

tests/integrations/celery/integration_tests/test_celery_beat_cron_monitoring.py

@@ -53,10 +53,7 @@ def inner(propagate_traces=True, monitor_beat_tasks=False, **kwargs):
     return inner
 
 
-@pytest.mark.skipif(
-    sys.version_info < (3, 8),
-    reason="Requires Python 3.8+ (py3.7 + container fork hits kombu/redis-py issue)",
-)
+@pytest.mark.skipif(sys.version_info < (3, 7), reason="Requires Python 3.7+")
 @pytest.mark.forked
 def test_explanation(celery_init, capture_envelopes):
     """
@@ -95,10 +92,7 @@ def test_task():
     assert len(envelopes) >= 0
 
 
-@pytest.mark.skipif(
-    sys.version_info < (3, 8),
-    reason="Requires Python 3.8+ (py3.7 + container fork hits kombu/redis-py issue)",
-)
+@pytest.mark.skipif(sys.version_info < (3, 7), reason="Requires Python 3.7+")
 @pytest.mark.forked
 def test_beat_task_crons_success(celery_init, capture_envelopes):
     app = celery_init(
@@ -131,10 +125,7 @@ def test_task():
     assert check_in["status"] == "ok"
 
 
-@pytest.mark.skipif(
-    sys.version_info < (3, 8),
-    reason="Requires Python 3.8+ (py3.7 + container fork hits kombu/redis-py issue)",
-)
+@pytest.mark.skipif(sys.version_info < (3, 7), reason="Requires Python 3.7+")
 @pytest.mark.forked
 def test_beat_task_crons_error(celery_init, capture_envelopes):
     app = celery_init(

tox.ini

@@ -752,7 +752,6 @@ deps =
     celery: redis
     {py3.6}-celery: newrelic<8
     {py3.7}-celery: importlib-metadata<5.0
-    {py3.7}-celery: pytest-timeout
 
     dramatiq-v1.9.0: dramatiq==1.9.0
     dramatiq-v2.1.0: dramatiq==2.1.0
@@ -1000,10 +999,6 @@ setenv =
     common: PYTEST_ADDOPTS="--ignore=tests/test_shadowed_module.py"
     gevent: PYTEST_ADDOPTS="--ignore=tests/test_shadowed_module.py"
 
-    # Debug CI hangs for celery on py3.7: dump tracebacks and fail the test
-    # rather than letting the job time out at the workflow level.
-    py3.7-celery: PYTEST_ADDOPTS=--timeout=120 --timeout-method=thread
-
     # TESTPATH definitions for test suites not managed by toxgen
     common: _TESTPATH=tests
     gevent: _TESTPATH=tests
@@ -1084,6 +1079,7 @@ passenv =
     SENTRY_PYTHON_TEST_POSTGRES_USER
     SENTRY_PYTHON_TEST_POSTGRES_PASSWORD
     SENTRY_PYTHON_TEST_POSTGRES_NAME
+    SENTRY_PYTHON_TEST_REDIS_HOST
     TESTPATH
 
 basepython =