chore: remove the logic of Actor._get_default_exit_process for pytest from production code

src/apify/_actor.py

@@ -1,7 +1,6 @@
 from __future__ import annotations
 
 import asyncio
-import os
 import sys
 from contextlib import suppress
 from datetime import datetime, timedelta, timezone
@@ -1288,16 +1287,11 @@ def _raise_if_not_initialized(self) -> None:
             raise RuntimeError('The Actor was not initialized!')
 
     def _get_default_exit_process(self) -> bool:
-        """Return False for IPython, Pytest, and Scrapy environments, True otherwise."""
+        """Return False for IPython and Scrapy environments, True otherwise."""
         if is_running_in_ipython():
             self.log.debug('Running in IPython, setting default `exit_process` to False.')
             return False
 
-        # Check if running in Pytest by detecting the relevant environment variable.
-        if os.getenv('PYTEST_CURRENT_TEST'):
-            self.log.debug('Running in Pytest, setting default `exit_process` to False.')
-            return False
-
         # Check if running in Scrapy by attempting to import it.
         with suppress(ImportError):
             import scrapy  # noqa: F401 PLC0415

tests/unit/actor/test_actor_log.py

@@ -15,7 +15,7 @@ async def test_actor_logs_messages_correctly(caplog: pytest.LogCaptureFixture) -
     caplog.set_level(logging.DEBUG, logger='apify')
 
     with contextlib.suppress(RuntimeError):
-        async with Actor(configure_logging=False):
+        async with Actor(configure_logging=False, exit_process=False):
             # Test Actor.log
             Actor.log.debug('Debug message')
             Actor.log.info('Info message')
@@ -36,77 +36,72 @@ async def test_actor_logs_messages_correctly(caplog: pytest.LogCaptureFixture) -
             # Test that exception in Actor.main is logged with the traceback
             raise RuntimeError('Dummy RuntimeError')
 
+    # We skip the first entry, as it is related to the initialization of `lazy_object_proxy.Proxy` for `Actor`.
+    records = caplog.records[1:]
+
     # Updated expected number of log records (additional debug messages added)
-    assert len(caplog.records) == 16
-
-    # Record 0: First Pytest context log
-    assert caplog.records[0].levelno == logging.DEBUG
-    assert caplog.records[0].message.startswith('Running in Pytest')
-
-    # Record 1: Duplicate Pytest context log
-    assert caplog.records[1].levelno == logging.DEBUG
-    assert caplog.records[1].message.startswith('Running in Pytest')
-
-    # Record 2: Logging configured
-    assert caplog.records[2].levelno == logging.DEBUG
-    assert caplog.records[2].message == 'Logging configured'
-
-    # Record 3: Initializing Actor
-    assert caplog.records[3].levelno == logging.INFO
-    assert caplog.records[3].message == 'Initializing Actor'
-
-    # Record 4: Configuration initialized
-    assert caplog.records[4].levelno == logging.DEBUG
-    assert caplog.records[4].message == 'Configuration initialized'
-
-    # Record 5: Storage client initialized
-    assert caplog.records[5].levelno == logging.DEBUG
-    assert caplog.records[5].message == 'Storage client initialized'
-
-    # Record 6: Event manager initialized
-    assert caplog.records[6].levelno == logging.DEBUG
-    assert caplog.records[6].message == 'Event manager initialized'
-
-    # Record 7: Charging manager initialized
-    assert caplog.records[7].levelno == logging.DEBUG
-    assert caplog.records[7].message == 'Charging manager initialized'
-
-    # Record 8: Debug message
-    assert caplog.records[8].levelno == logging.DEBUG
-    assert caplog.records[8].message == 'Debug message'
-
-    # Record 9: Info message
-    assert caplog.records[9].levelno == logging.INFO
-    assert caplog.records[9].message == 'Info message'
-
-    # Record 10: Warning message
-    assert caplog.records[10].levelno == logging.WARNING
-    assert caplog.records[10].message == 'Warning message'
-
-    # Record 11: Error message
-    assert caplog.records[11].levelno == logging.ERROR
-    assert caplog.records[11].message == 'Error message'
-
-    # Record 12: Exception message with traceback (ValueError)
-    assert caplog.records[12].levelno == logging.ERROR
-    assert caplog.records[12].message == 'Exception message'
-    assert caplog.records[12].exc_info is not None
-    assert caplog.records[12].exc_info[0] is ValueError
-    assert isinstance(caplog.records[12].exc_info[1], ValueError)
-    assert str(caplog.records[12].exc_info[1]) == 'Dummy ValueError'
-
-    # Record 13: Multiline log message
-    assert caplog.records[13].levelno == logging.INFO
-    assert caplog.records[13].message == 'Multi\nline\nlog\nmessage'
-
-    # Record 14: Actor failed with an exception (RuntimeError)
-    assert caplog.records[14].levelno == logging.ERROR
-    assert caplog.records[14].message == 'Actor failed with an exception'
-    assert caplog.records[14].exc_info is not None
-    assert caplog.records[14].exc_info[0] is RuntimeError
-    assert isinstance(caplog.records[14].exc_info[1], RuntimeError)
-    assert str(caplog.records[14].exc_info[1]) == 'Dummy RuntimeError'
-
-    # Record 15: Exiting Actor
-    assert caplog.records[15].levelno == logging.INFO
-    assert caplog.records[15].message == 'Exiting Actor'
+    assert len(records) == 14
+
+    # Record 0: Logging configured
+    assert records[0].levelno == logging.DEBUG
+    assert records[0].message == 'Logging configured'
+
+    # Record 1: Initializing Actor
+    assert records[1].levelno == logging.INFO
+    assert records[1].message == 'Initializing Actor'
+
+    # Record 2: Configuration initialized
+    assert records[2].levelno == logging.DEBUG
+    assert records[2].message == 'Configuration initialized'
+
+    # Record 3: Storage client initialized
+    assert records[3].levelno == logging.DEBUG
+    assert records[3].message == 'Storage client initialized'
+
+    # Record 4: Event manager initialized
+    assert records[4].levelno == logging.DEBUG
+    assert records[4].message == 'Event manager initialized'
+
+    # Record 5: Charging manager initialized
+    assert records[5].levelno == logging.DEBUG
+    assert records[5].message == 'Charging manager initialized'
+
+    # Record 6: Debug message
+    assert records[6].levelno == logging.DEBUG
+    assert records[6].message == 'Debug message'
+
+    # Record 7: Info message
+    assert records[7].levelno == logging.INFO
+    assert records[7].message == 'Info message'
+
+    # Record 8: Warning message
+    assert records[8].levelno == logging.WARNING
+    assert records[8].message == 'Warning message'
+
+    # Record 9: Error message
+    assert records[9].levelno == logging.ERROR
+    assert records[9].message == 'Error message'
+
+    # Record 10: Exception message with traceback (ValueError)
+    assert records[10].levelno == logging.ERROR
+    assert records[10].message == 'Exception message'
+    assert records[10].exc_info is not None
+    assert records[10].exc_info[0] is ValueError
+    assert isinstance(records[10].exc_info[1], ValueError)
+    assert str(records[10].exc_info[1]) == 'Dummy ValueError'
+
+    # Record 11: Multiline log message
+    assert records[11].levelno == logging.INFO
+    assert records[11].message == 'Multi\nline\nlog\nmessage'
+
+    # Record 12: Actor failed with an exception (RuntimeError)
+    assert records[12].levelno == logging.ERROR
+    assert records[12].message == 'Actor failed with an exception'
+    assert records[12].exc_info is not None
+    assert records[12].exc_info[0] is RuntimeError
+    assert isinstance(records[12].exc_info[1], RuntimeError)
+    assert str(records[12].exc_info[1]) == 'Dummy RuntimeError'
+
+    # Record 13: Exiting Actor
+    assert records[13].levelno == logging.INFO
+    assert records[13].message == 'Exiting Actor'