Skip to content

Commit e87ab1a

Browse files
: python/tests/test_actors.py: no fork re-enable some tests
Differential Revision: D87507353
1 parent d445cba commit e87ab1a

File tree

1 file changed

+8
-16
lines changed

1 file changed

+8
-16
lines changed

python/tests/test_python_actors.py

Lines changed: 8 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -541,8 +541,7 @@ def redirected_stdio(capture_stderr: bool = True):
541541
stderr_file.close()
542542

543543

544-
# oss_skip: pytest keeps complaining about mocking get_ipython module
545-
@pytest.mark.oss_skip
544+
@pytest.mark.timeout(180)
546545
async def test_actor_log_streaming() -> None:
547546
with configured(
548547
enable_log_forwarding=True, enable_file_capture=True, tail_log_lines=100
@@ -648,9 +647,7 @@ async def test_actor_log_streaming() -> None:
648647
), stderr_content
649648

650649

651-
# oss_skip: pytest keeps complaining about mocking get_ipython module
652-
# oss_skip: (SF) broken in GitHub by D86994420. Passes internally.
653-
@pytest.mark.oss_skip
650+
@pytest.mark.timeout(180)
654651
async def test_alloc_based_log_streaming() -> None:
655652
"""Test both AllocHandle.stream_logs = False and True cases."""
656653

@@ -721,8 +718,7 @@ def _stream_logs(self) -> bool:
721718
await test_stream_logs_case(True, "stream_logs_true")
722719

723720

724-
# oss_skip: (SF) broken in GitHub by D86994420. Passes internally.
725-
@pytest.mark.oss_skip
721+
@pytest.mark.timeout(180)
726722
async def test_logging_option_defaults() -> None:
727723
with configured(
728724
enable_log_forwarding=True, enable_file_capture=True, tail_log_lines=100
@@ -787,8 +783,7 @@ def __init__(self):
787783
self.events = MockEvents()
788784

789785

790-
# oss_skip: pytest keeps complaining about mocking get_ipython module
791-
@pytest.mark.oss_skip
786+
@pytest.mark.timeout(180)
792787
async def test_flush_called_only_once() -> None:
793788
"""Test that flush is called only once when ending an ipython cell"""
794789
with configured(
@@ -818,8 +813,6 @@ async def test_flush_called_only_once() -> None:
818813
assert mock_flush.call_count == 1
819814

820815

821-
# oss_skip: pytest keeps complaining about mocking get_ipython module
822-
@pytest.mark.oss_skip
823816
@pytest.mark.timeout(180)
824817
async def test_flush_logs_ipython() -> None:
825818
"""Test that logs are flushed when get_ipython is available and post_run_cell event is triggered."""
@@ -879,7 +872,8 @@ async def test_flush_logs_ipython() -> None:
879872
assert len(re.findall(pattern2, stdout_content)) >= 3, stdout_content
880873

881874

882-
# oss_skip: importlib not pulling resource correctly in git CI, needs to be revisited
875+
# oss_skip: importlib not pulling resource correctly in git CI, needs
876+
# to be revisited
883877
@pytest.mark.oss_skip
884878
async def test_flush_logs_fast_exit() -> None:
885879
with configured(
@@ -912,8 +906,7 @@ async def test_flush_logs_fast_exit() -> None:
912906
), process.stdout
913907

914908

915-
# oss_skip: (SF) broken in GitHub by D86994420. Passes internally.
916-
@pytest.mark.oss_skip
909+
@pytest.mark.timeout(180)
917910
async def test_flush_on_disable_aggregation() -> None:
918911
"""Test that logs are flushed when disabling aggregation.
919912
@@ -1008,8 +1001,7 @@ async def test_multiple_ongoing_flushes_no_deadlock() -> None:
10081001
futures[-1].get()
10091002

10101003

1011-
# oss_skip: (SF) broken in GitHub by D86994420. Passes internally.
1012-
@pytest.mark.oss_skip
1004+
@pytest.mark.timeout(180)
10131005
async def test_adjust_aggregation_window() -> None:
10141006
"""Test that the flush deadline is updated when the aggregation window is adjusted.
10151007

0 commit comments

Comments
 (0)