diff --git a/DEVLOG.md b/DEVLOG.md index 0201b4a..67fe06a 100644 --- a/DEVLOG.md +++ b/DEVLOG.md @@ -2691,3 +2691,8 @@ QMT11:53:36至11:54:04短暂中断,自动重连恢复,外部原因未核实 开发机及155最终候选镜像均通过隔离回归:PMS `ALL SUITES PASS`,上游64项 `OK`;页面三道护栏、1440和390像素浏览器复现通过,六个名称保存为六代码,未知名称整批拒绝,控制台错误和警告0。12:39:42仅web发布 `pms:plan-names-8e6ce09`,上游12:39:38发布 `bridge:plan-names-c11ae65`;开发提交8e6ce09/c11ae65已推送并核对远程,155代码b8037d5/d9c4b92。worker、beat、唯一WS保持原容器,环境、挂载、用户参数、私有脚本和上游data保持。 12:40:19真机只读核验:六只均可经PMS搜索且唯一映射,批量解析结果与证券基础表一致;登记仍为0条、revision=0,没有代替用户添加。确认序号1596110与接收相等,最新160条无缺口,资金13.1秒,数量现金对账0差异,无新增拒绝和重连。12:40:24上游自然刷新完成,无错误或待评估积压。web启动后高股息接口一次超时,随后只读调用恢复182行;新增搜索与解析正常。代码指纹 `1d92e659f123`,页面摘要 `adbd12d451f62a1ebdbf9463ec3db1080b9dd1e5c157198b85da630bc3c71fee` 与本机一致。备份及证据见[批量股票名称修复核验](docs/evidence/pms_plan_candidate_names_20261103.json)。首次真实登记与自然评估仍由用户正常操作,不制造测试委托。 + + +### 2026-11-03 14:14 自然调度补修 + +155首轮发布后,页面、QMT回放和对账正常,但自然调度暴露scheduler新增入口缺少模块级ParamStore导入,执行扫描按守成中止。原测试只核对调度注册,未直接调用此入口。已补导入和五项真实任务入口隔离测试,覆盖新旧扫描、独立刷新与全局暂停下撤单收尾。按候选镜像断网回归后仅重建受影响worker,其他服务不为追平版本重建。最终结果另记。 diff --git a/app/scheduler.py b/app/scheduler.py index 8acdb7e..e14e60b 100644 --- a/app/scheduler.py +++ b/app/scheduler.py @@ -34,6 +34,7 @@ from celery import Celery from celery.schedules import crontab from config.settings import settings +from app.services import param_store from app.core import tradedays as td logging.basicConfig(level=logging.INFO, diff --git a/scripts/run_tests.py b/scripts/run_tests.py index b62f5e8..1241c4c 100644 --- a/scripts/run_tests.py +++ b/scripts/run_tests.py @@ -7,7 +7,7 @@ test_batch54_units.py 用户候选来源、到期核验、权限、显式取用与技术面补读 (9例) 包含 (例数按 2026-10-26 隔离回归实跑校正): - test_batch57_units.py 异步请求持久化、截止时间、旧结果隔离、失败续查及行情来源 (19例) + test_batch57_units.py 异步请求持久化、截止时间、旧结果隔离、失败续查、真实调度入口及行情来源 (24例) test_batch56_units.py 微盘v3冻结候选、按序递补与部分成交保护 (40例) test_batch55_units.py 共同撤换状态、报价、依据监控与取消确认 (34例) test_sim_reset_units.py 双账本重置、空仓证据、配置与去重保留、幂等及SQL回滚 (9例) diff --git a/scripts/test_batch57_units.py b/scripts/test_batch57_units.py index 4b7df9a..47a5e5c 100644 --- a/scripts/test_batch57_units.py +++ b/scripts/test_batch57_units.py @@ -171,6 +171,55 @@ class AsyncJudgeTests(unittest.TestCase): self.assertEqual(out['queued']+out['executed']+out['rejected'],[]) +class SchedulerEntryTests(unittest.TestCase): + def setUp(self): + from app import scheduler + from app.services import executor, proposal_service, strategy_runner, daily_buy_review, execution_basis + self.sch = scheduler + self.fake = install_fakes(params={'PMS_JUDGE_ASYNC_ENABLED':True, + 'PMS_EXEC_REPRICE_ENABLED':True}) + patch.object(scheduler.td,'is_trade_day',return_value=True).start() + patch.object(scheduler,'in_session',return_value=True).start() + self.model = patch.object(proposal_service,'scan_and_route',return_value={'ok':True}).start() + self.review = patch.object(daily_buy_review,'process',return_value={'waiting':[]}).start() + self.refresh = patch.object(execution_basis,'refresh',return_value={'enabled':True}).start() + self.monitor = patch.object(execution_basis,'monitor',return_value={'cancelled':[]}).start() + patch.object(executor,'materialize_plans',return_value={}).start() + patch.object(executor,'sweep_windows',return_value={}).start() + patch.object(executor,'run_tick',return_value={'fired':[]}).start() + patch.object(strategy_runner,'tick',return_value={}).start() + self.addCleanup(patch.stopall) + + def test_async_execution_entry_does_not_scan_judgements(self): + result = self.sch.intraday_exec.run() + self.assertNotIn('error',result) + self.assertEqual(result['fired'],[]) + self.model.assert_not_called();self.review.assert_not_called() + self.monitor.assert_called_once_with() + + def test_legacy_execution_entry_keeps_proposals_and_daily_review(self): + self.fake.params['PMS_JUDGE_ASYNC_ENABLED']=False + result=self.sch.intraday_exec.run() + self.assertNotIn('error',result) + self.model.assert_called_once_with();self.review.assert_called_once_with() + + def test_async_proposal_entry_runs_its_own_daily_review(self): + result=self.sch.proposal_scan.run() + self.assertTrue(result['ok']) + self.review.assert_called_once_with();self.model.assert_called_once_with() + + def test_basis_refresh_entry_uses_new_flag(self): + self.assertEqual(self.sch.execution_basis_refresh.run(),{'enabled':True}) + self.refresh.assert_called_once_with() + + def test_cancel_confirm_entry_continues_under_global_halt(self): + self.fake.params['PMS_GLOBAL_EXEC_HALT']=True + with patch.object(self.sch,'in_session',return_value=False): + self.assertEqual(self.sch.execution_cancel_confirm.run(),{'cancelled':[]}) + self.monitor.assert_called_once_with(cancel_only=True) + self.model.assert_not_called();self.refresh.assert_not_called() + + class QuoteTests(unittest.TestCase): def test_minute_quote_keeps_unknown_halt_and_no_invented_level1(self): with patch.object(market,'_bars',return_value=[{'time':'2026-11-03 09:59:00','close':10}]):