From 3fcc78b99c2a05d0af5dd76d013fd32d0b388155 Mon Sep 17 00:00:00 2001 From: Administrator <admin@example.com> Date: 星期三, 06 十二月 2023 17:29:32 +0800 Subject: [PATCH] bug修复 --- test/l2_trade_test.py | 35 +++++++++++++++++++++-------------- 1 files changed, 21 insertions(+), 14 deletions(-) diff --git a/test/l2_trade_test.py b/test/l2_trade_test.py index daff17a..1a996cc 100644 --- a/test/l2_trade_test.py +++ b/test/l2_trade_test.py @@ -85,11 +85,11 @@ except Exception as e: pass - @unittest.skip("璺宠繃姝ゅ崟鍏冩祴璇�") + # @unittest.skip("璺宠繃姝ゅ崟鍏冩祴璇�") def test_trade(self): trade_manager.TradeStateManager().open_buy() threading.Thread(target=async_log_util.run_sync, daemon=True).start() - code = "002848" + code = "603161" clear_trade_data(code) l2.l2_data_util.load_l2_data(code) total_datas = deepcopy(l2.l2_data_util.local_today_datas[code]) @@ -136,6 +136,10 @@ # pos_list.insert(75, (472, 488)) # pos_list.insert(84, (516, 532)) + # hook + tool.get_now_time_str = mock.Mock(return_value="09:35:00") + CodePlateKeyBuyManager.can_buy = mock.Mock(return_value=(["娴嬭瘯"], False, "")) + # 鑾峰彇浜ゆ槗杩涘害 trade_progress_list, buy_queues = log_export.get_trade_progress(code) trade_progress_list.reverse() @@ -177,17 +181,19 @@ break print("----------------澶勭悊浣嶇疆", indexs) - for l2_m in l2_market_datas: - if int(str(l2_m["dataTimeStamp"])[:-3]) < int(total_datas[indexs[0]]["val"]["time"].replace(":", "")): - time_str = f"{l2_m['dataTimeStamp']}" - if time_str.startswith("9"): - time_str = "0" + time_str - time_str = time_str[:6] - time_str = f"{time_str[0:2]}:{time_str[2:4]}:{time_str[4:6]}" - L2MarketSellManager().set_current_total_sell_data(code, time_str, - l2_m["totalAskVolume"] * l2_m["avgAskPrice"], - l2_m["totalAskVolume"]) - break + if l2_market_datas: + for l2_m in l2_market_datas: + if int(str(l2_m["dataTimeStamp"])[:-3]) < int( + total_datas[indexs[0]]["val"]["time"].replace(":", "")): + time_str = f"{l2_m['dataTimeStamp']}" + if time_str.startswith("9"): + time_str = "0" + time_str + time_str = time_str[:6] + time_str = f"{time_str[0:2]}:{time_str[2:4]}:{time_str[4:6]}" + L2MarketSellManager().set_current_total_sell_data(code, time_str, + l2_m["totalAskVolume"] * l2_m["avgAskPrice"], + l2_m["totalAskVolume"]) + break for tp in trade_progress_list: if int(tp[1].replace(":", "")) < int(total_datas[indexs[0]]["val"]["time"].replace(":", "")): @@ -217,7 +223,8 @@ # @unittest.skip("璺宠繃姝ゅ崟鍏冩祴璇�") def test_block(self): code = "002036" - KPLCodeJXBlockManager().load_jx_blocks(code, 11.83, 11.83, kpl_data_manager.KPLLimitUpDataRecordManager.get_current_reasons()) + KPLCodeJXBlockManager().load_jx_blocks(code, 11.83, 11.83, + kpl_data_manager.KPLLimitUpDataRecordManager.get_current_reasons()) block_info.init_code(code) kpl_data_manager.KPLLimitUpDataRecordManager.load_total_datas() -- Gitblit v1.8.0