[Misc] Cleanup: use consistent pytest-mock in unit tests (#2698)
Signed-off-by: yuanheng <jonathan.zhaoyh@gmail.com>
This commit is contained in:
1 parent
2c67c30550
commit
e0cdbe9a5d
26 files changed
+1598
-1369
No files matched your search
@@ -6,7 +6,6 @@ internal deques but restore_queues() is not called due to an exception,
|
||||
those requests are permanently orphaned.
|
||||
"""
|
||||
|
||||
import unittest
|
||||
from collections import deque
|
||||
|
||||
import pytest
|
||||
@@ -39,7 +38,7 @@ class FakeAdapter:
|
||||
pass
|
||||
|
||||
|
||||
class TestRestoreQueuesOnError(unittest.TestCase):
|
||||
class TestRestoreQueuesOnError:
|
||||
"""Verify that restore_queues is called even when rewrapping raises."""
|
||||
|
||||
def test_requests_not_lost_on_exception(self):
|
||||
@@ -52,8 +51,8 @@ class TestRestoreQueuesOnError(unittest.TestCase):
|
||||
|
||||
# Step 1: process_pending_chunks moves req-B out
|
||||
adapter.process_pending_chunks(waiting=[], running=running)
|
||||
self.assertEqual(running, ["req-A"])
|
||||
self.assertEqual(len(adapter.waiting_for_chunk_running_requests), 1)
|
||||
assert running == ["req-A"]
|
||||
assert len(adapter.waiting_for_chunk_running_requests) == 1
|
||||
|
||||
# Step 2: simulate the try/except/finally pattern
|
||||
try:
|
||||
@@ -65,9 +64,9 @@ class TestRestoreQueuesOnError(unittest.TestCase):
|
||||
adapter.restore_queues(waiting=[], running=running)
|
||||
|
||||
# Step 3: verify request is restored
|
||||
self.assertTrue(adapter.restore_called)
|
||||
self.assertIn("req-B", running)
|
||||
self.assertEqual(len(adapter.waiting_for_chunk_running_requests), 0)
|
||||
assert adapter.restore_called is True
|
||||
assert "req-B" in running
|
||||
assert len(adapter.waiting_for_chunk_running_requests) == 0
|
||||
|
||||
def test_requests_lost_without_fix(self):
|
||||
"""Demonstrate the bug: without restore in except, request is lost."""
|
||||
@@ -76,7 +75,7 @@ class TestRestoreQueuesOnError(unittest.TestCase):
|
||||
running = ["req-A", "req-B"]
|
||||
|
||||
adapter.process_pending_chunks(waiting=[], running=running)
|
||||
self.assertEqual(running, ["req-A"])
|
||||
assert running == ["req-A"]
|
||||
|
||||
# Simulate the BUGGY code: except without restore
|
||||
try:
|
||||
@@ -85,8 +84,8 @@ class TestRestoreQueuesOnError(unittest.TestCase):
|
||||
pass # Bug: no restore_queues call
|
||||
|
||||
# Request is lost!
|
||||
self.assertNotIn("req-B", running)
|
||||
self.assertEqual(len(adapter.waiting_for_chunk_running_requests), 1)
|
||||
assert "req-B" not in running
|
||||
assert len(adapter.waiting_for_chunk_running_requests) == 1
|
||||
|
||||
def test_happy_path_restores_via_finally(self):
|
||||
"""When no exception, restore_queues is still called via finally."""
|
||||
@@ -102,9 +101,5 @@ class TestRestoreQueuesOnError(unittest.TestCase):
|
||||
finally:
|
||||
adapter.restore_queues(waiting=[], running=running)
|
||||
|
||||
self.assertTrue(adapter.restore_called)
|
||||
self.assertIn("req-B", running)
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
unittest.main()
|
||||
assert adapter.restore_called is True
|
||||
assert "req-B" in running
|
||||
Reference in new issue
Block a user