From 610092f968e144d6c6604368064574836dfe1038 Mon Sep 17 00:00:00 2001 From: Justin Gu <97915@qq.com> Date: Sat, 5 Sep 2026 11:42:04 +0800 Subject: [PATCH] =?UTF-8?q?test:=20ex=5Freconnect=20=E6=B5=8B=E8=AF=95?= =?UTF-8?q?=E5=AF=86=E9=97=AD=E5=8C=96=20=E2=80=94=20=E5=B1=8F=E8=94=BD?= =?UTF-8?q?=E8=B7=A8=E4=B8=BB=E6=9C=BA=E6=95=85=E9=9A=9C=E8=BD=AC=E7=A7=BB?= =?UTF-8?q?=E7=9A=84=E7=9C=9F=E5=AE=9E=E7=BD=91=E7=BB=9C=E6=8E=A2=E6=B5=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit TestMacExClientReconnect::test_all_retries_relogin_each_time 在部分机器 login 计数 5 != 4：4 次退避重试耗尽后 _execute 会走跨主机故障转移 （select_best_host_sync 真实测速），找到可切换主机时会再 connect+login 一次——测试未 mock 该阶段，断言结果依赖运行环境的网络可达性。 - 新增 autouse 夹具把 ex.client / ex.mac_client 的 select_best_host_sync/async 统一 patch 为"找不到新主机"，全部用例密闭化、不再发真实探测 - 新增 test_failover_stage_relogs_in_and_raises：显式钉住故障转移找到 新主机时也必须 _login()（4+1=5 次）且仍失败则抛出的语义 --- tests/unit/test_ex_reconnect.py | 34 ++++++++++++++++++++++++++++++++- 1 file changed, 33 insertions(+), 1 deletion(-) diff --git a/tests/unit/test_ex_reconnect.py b/tests/unit/test_ex_reconnect.py index da745b0..180c5ef 100644 --- a/tests/unit/test_ex_reconnect.py +++ b/tests/unit/test_ex_reconnect.py @@ -19,6 +19,20 @@ from easy_tdx.ex.mac_client import AsyncMacExClient, MacExClient from easy_tdx.exceptions import TdxConnectionError +@pytest.fixture(autouse=True) +def _no_failover(): + """屏蔽跨主机故障转移：select_best_host_* 会真实探测网络（密闭性）， + 且找到新主机时会多一轮 connect+login，使重试阶段的计数断言依赖网络环境。 + 需要验证故障转移语义的测试可在用例内再覆盖此 patch。""" + with ( + patch("easy_tdx.ex.client.select_best_host_sync", return_value=None), + patch("easy_tdx.ex.client.select_best_host_async", new=AsyncMock(return_value=None)), + patch("easy_tdx.ex.mac_client.select_best_host_sync", return_value=None), + patch("easy_tdx.ex.mac_client.select_best_host_async", new=AsyncMock(return_value=None)), + ): + yield + + class TestExTdxClientReconnect: def test_reconnect_succeeds_on_second_attempt(self) -> None: """首次抛 TdxConnectionError，重连后第 1 次重试成功。""" @@ -78,7 +92,7 @@ class TestMacExClientReconnect: assert mock_login.call_count == 1 def test_all_retries_relogin_each_time(self) -> None: - """4 次重试全失败时，每次重连都应 _login()（共 4 次）。""" + """4 次重试全失败时，每次重连都应 _login()（共 4 次；故障转移已被屏蔽）。""" with patch("easy_tdx.ex.mac_client.ExTdxConnection") as mock_conn_cls: mock_conn = MagicMock() mock_conn.execute.side_effect = TdxConnectionError("always down") @@ -93,6 +107,24 @@ class TestMacExClientReconnect: client._execute(GetExMarketsCmd()) assert mock_login.call_count == len(_RETRY_DELAYS) + def test_failover_stage_relogs_in_and_raises(self) -> None: + """跨主机故障转移找到新主机时也必须 _login()；仍失败则抛出（共 5 次）。""" + with patch("easy_tdx.ex.mac_client.ExTdxConnection") as mock_conn_cls: + mock_conn = MagicMock() + mock_conn.execute.side_effect = TdxConnectionError("always down") + mock_conn_cls.return_value = mock_conn + + client = MacExClient("1.1.1.1", auto_reconnect=True) + with ( + patch("easy_tdx.ex.mac_client.time.sleep"), + patch.object(client, "_login") as mock_login, + patch("easy_tdx.ex.mac_client.select_best_host_sync", return_value="2.2.2.2"), + ): + with pytest.raises(TdxConnectionError): + client._execute(GetExMarketsCmd()) + # 4 次退避重连 + 1 次故障转移 = 5 次 _login + assert mock_login.call_count == len(_RETRY_DELAYS) + 1 + class TestAsyncExTdxClientReconnect: def test_async_all_retries_exhausted(self) -> None: