- Split framework into core/ (config, logger, db, driver factories, screenshot, allure integration) and pages/ (PO layer: base/admin/driver); flatten test files per platform (web/admin, app/driver_android, cross_end) - Slim root conftest.py 656 -> ~100 lines: drop inline CN HTML report, add Allure severity mapping (p0/p1/p2 -> blocker/normal/minor) and environment.properties; support both tests.*-prefixed and bare imports - Preserve TC-D2S-001/002 cross-end E2E cases with business logic unchanged, add allure epic/feature/story/step annotations - Deduplicate: single makereport hook, shared failure-screenshot helpers, single SCREENSHOTS_DIR constant; deterministic auth-state role loading - Move DB credentials from db_helper.py into test_config.yaml (database section) - Move pytest.ini to repo root; switch reporting to allure-pytest (drop pytest-html/junitxml); update requirements.txt accordingly - Delete deprecated scaffolding: test_freight_full_flow + 6 stale page objects, iOS/shipper empty shells, dead utils - Fix flaky vxe-table action-row wait: wait for a visible td instead of hidden placeholder rows (fixed shipper-payment timeouts) - Verified end-to-end against live env: both E2E cases pass (2 passed 3m12s); run artifacts (logs/screenshots/allure) included per repo convention
34 lines
855 B
Python
34 lines
855 B
Python
"""司机安卓端 fixtures — Appium + 登录态复用。"""
|
|
|
|
import pytest
|
|
|
|
from tests.core.appium_support import (
|
|
create_driver,
|
|
make_ensure_logged_in,
|
|
save_failure_screenshot,
|
|
)
|
|
|
|
|
|
@pytest.fixture
|
|
def driver(driver_android_config, request):
|
|
"""司机安卓端 driver (noReset=true)。"""
|
|
cfg = driver_android_config
|
|
d = None
|
|
try:
|
|
d = create_driver(cfg, platform="android")
|
|
yield d
|
|
save_failure_screenshot(d, cfg, "android", request)
|
|
finally:
|
|
if d is not None:
|
|
try:
|
|
d.quit()
|
|
except Exception:
|
|
pass
|
|
|
|
|
|
@pytest.fixture
|
|
def ensure_logged_in(driver_android_config, config):
|
|
"""确保已登录态(司机角色)。"""
|
|
fn = make_ensure_logged_in(driver_android_config, config, account_role="driver")
|
|
return lambda d: fn(d)
|