@hupan56/wlkj 3.0.0 → 3.1.2

package/templates/qoder/scripts/{test → validation/test}/autotest_batch.py

@@ -1,7 +1,12 @@
 # -*- coding: utf-8 -*-
 # v3.0 路径自举: 引导到 common/bootstrap, 统一 sys.path 逻辑
 import os as _o, sys as _s
-_cp = _o.path.join(_o.path.dirname(_o.path.dirname(_o.path.abspath(__file__))), 'common')
+_f = _o.path.abspath(__file__)
+for _ in range(10):
+    _f = _o.path.dirname(_f)
+    _cp = _o.path.join(_f, 'foundation')
+    if _o.path.isfile(_o.path.join(_cp, 'bootstrap.py')):
+        break
 if _cp not in _s.path: _s.path.insert(0, _cp)
 from bootstrap import setup; setup()
 
@@ -21,14 +26,22 @@ BASE = 'https://icsqas.inforecloud.com'
 ACCESS_KEY = 'ICS-1.3.8-prod-core-access'
 SECRET = 'please-replace-me-with-your-own-key'
 SCRIPTS = os.path.dirname(os.path.abspath(__file__))
-PROJECT = os.path.normpath(os.path.join(SCRIPTS, '..', '..'))
+# test 目录在 .qoder/scripts/test, 回项目根要上 3 级. 向上找含 .qoder 的目录兜底.
+_d = SCRIPTS
+while _d != os.path.dirname(_d):
+    if os.path.isdir(os.path.join(_d, '.qoder')):
+        PROJECT = _d
+        break
+    _d = os.path.dirname(_d)
+else:
+    PROJECT = os.path.normpath(os.path.join(SCRIPTS, '..', '..', '..'))
 SECURELS_JS = os.path.join(SCRIPTS, 'secure-ls.js')
 
 
 # v3.0: 登录态从 common.autotest_auth 复用 (单一真源, 消除 3 处重复)
 sys.path.insert(0, SCRIPTS)
 try:
-    from common.autotest_auth import get_developer as read_developer, auth_file, get_token as _get_token_shared
+    from test.autotest_auth import get_developer as read_developer, auth_file, get_token as _get_token_shared
 
     DEV = read_developer()
     AUTH_FILE = auth_file(DEV)

package/templates/qoder/scripts/{test → validation/test}/autotest_data.py

@@ -7,14 +7,19 @@ autotest.py(命令层) 通过 from autotest_data import * 使用。
 """
 # v3.0 路径自举
 import os as _o, sys as _s
-_cp = _o.path.join(_o.path.dirname(_o.path.dirname(_o.path.abspath(__file__))), 'common')
+_f = _o.path.abspath(__file__)
+for _ in range(10):
+    _f = _o.path.dirname(_f)
+    _cp = _o.path.join(_f, 'foundation')
+    if _o.path.isfile(_o.path.join(_cp, 'bootstrap.py')):
+        break
 if _cp not in _s.path: _s.path.insert(0, _cp)
 from bootstrap import setup; setup()
 
 import os, sys, json, shutil
 from pathlib import Path
-from common.paths import get_repo_root, get_developer
-from common.task_utils import load_task_json, resolve_task_dir
+from foundation.core.paths import get_repo_root, get_developer
+from foundation.data.task_utils import load_task_json, resolve_task_dir
 
 
 # 路径常量
@@ -72,7 +77,7 @@ def load_config_section(section='autotest'):
     """加载 config.yaml 的指定段 (v3.0: 优先 Config 单例, 失败回退)。"""
     # 优先: Config 单例 (带 mtime 缓存)
     try:
-        from common.config import Config
+        from foundation.core.config import Config
         return Config.load().section(section, {}) or {}
     except Exception:
         pass
@@ -148,7 +153,7 @@ def local_data_path():
     """
     dev = _require_developer()
     try:
-        from common.paths import get_private_file
+        from foundation.core.paths import get_private_file
         return Path(str(get_private_file(LOCAL_DATA_FILENAME, dev)))
     except Exception:
         return Path(str(MEMBERS_DIR)) / dev / LOCAL_DATA_FILENAME
@@ -276,7 +281,7 @@ def save_local_test_data(key, value, env=None, platform=None):
         existing[platform][key] = value
     else:
         existing[key] = value
-    from common.atomicio import atomic_write_text
+    from foundation.io.atomicio import atomic_write_text
     header = ('# 个人测试数据 (本地, 已 gitignore, 不会 push/共享给团队)\n'
               '# 用 autotest.py set-data 管理, 或直接编辑本文件。\n'
               '# 顶层=通用; web/app=按平台; test/pre/prod=按环境; 环境.平台=最精确(优先级最高)\n\n')
@@ -290,7 +295,7 @@ def init_local_data_doc():
     if p.is_file():
         return str(p), False  # 已存在, 不覆盖
     os.makedirs(str(p.parent), exist_ok=True)
-    from common.atomicio import atomic_write_text
+    from foundation.io.atomicio import atomic_write_text
     template = (
         '# 个人测试数据 (本地, 已 gitignore, 不会 push/共享给团队)\n'
         '# 在这里填你的测试账号/密码。每个人只填自己的 members/{自己}/autotest-data.yaml。\n'
@@ -358,7 +363,7 @@ def is_logged_in(env, platform):
 def mark_logged_in(env, platform, base_url):
     """标记某 env/platform 已登录(登录用例 pass 后调用)。"""
     import yaml as _yaml
-    from common.atomicio import atomic_write_text
+    from foundation.io.atomicio import atomic_write_text
     p = login_state_path()
     os.makedirs(str(p.parent), exist_ok=True)
     state = load_login_state()
@@ -374,7 +379,7 @@ def mark_logged_in(env, platform, base_url):
 
 def clear_login_state(env=None, platform=None):
     """清除登录态。env/platform 都不给 = 全清。"""
-    from common.atomicio import atomic_write_text
+    from foundation.io.atomicio import atomic_write_text
     p = login_state_path()
     state = load_login_state()
     if env is None and platform is None:
@@ -407,7 +412,7 @@ def test_pages_path():
 
 def _load_test_pages():
     """读 test-pages.json。不存在返回空骨架。"""
-    from common.atomicio import safe_read_json
+    from foundation.io.atomicio import safe_read_json
     p = test_pages_path()
     data = safe_read_json(str(p), default=None)
     if not isinstance(data, dict):
@@ -419,7 +424,7 @@ def _load_test_pages():
 
 def _save_test_pages(data):
     """原子写 test-pages.json, 自动更新 updated + stats。"""
-    from common.atomicio import atomic_write_json
+    from foundation.io.atomicio import atomic_write_json
     data['updated'] = datetime.now().isoformat()[:19]
     pages = data.get('pages', {})
     n_anchors = sum(len(pg.get('elements', [])) for pg in pages.values())
@@ -578,7 +583,7 @@ def read_cases(task_dir):
 
 def write_cases(task_dir, cases):
     """原子覆盖写全部用例为 jsonl。"""
-    from common.atomicio import atomic_write_text
+    from foundation.io.atomicio import atomic_write_text
     p = _cases_path(task_dir)
     lines = [json.dumps(c, ensure_ascii=False, sort_keys=True) for c in cases]
     atomic_write_text(str(p), '\n'.join(lines) + ('\n' if lines else ''))