parent
18e66f8978
commit
193d25156c
12
conftest.py
12
conftest.py
|
@ -6,9 +6,11 @@
|
|||
# pylint: disable=C0114,W0621,C0411,C0412,R1706,E0401
|
||||
import sys
|
||||
from os import environ
|
||||
from setting.globalconfig import GlobalConfig
|
||||
|
||||
environ["DISPLAY"] = ":0"
|
||||
environ["XAUTHORITY"] = "/home/uos/.Xauthority"
|
||||
environ["XAUTHORITY"] = f"/home/{GlobalConfig.USERNAME}/.Xauthority"
|
||||
|
||||
from setting.globalconfig import SystemPath
|
||||
|
||||
for i in SystemPath:
|
||||
|
@ -41,8 +43,6 @@ from _pytest.mark import Mark
|
|||
from _pytest.terminal import TerminalReporter
|
||||
from funnylog.conf import setting as log_setting
|
||||
|
||||
from setting.globalconfig import GlobalConfig
|
||||
|
||||
letmego.conf.setting.PASSWORD = GlobalConfig.PASSWORD
|
||||
letmego.conf.setting.RUNNING_MAN_FILE = f"{GlobalConfig.REPORT_PATH}/_running_man.log"
|
||||
letmego.conf.setting.DEBUG = GlobalConfig.LETMEGO_DEBUG
|
||||
|
@ -283,7 +283,8 @@ def pytest_collection_modifyitems(session):
|
|||
|
||||
walk_dir = (
|
||||
f"{GlobalConfig.APPS_PATH}/{session.config.option.app_name}"
|
||||
if session.config.option.app_name and exists(f"{GlobalConfig.APPS_PATH}/{session.config.option.app_name}")
|
||||
if session.config.option.app_name and exists(
|
||||
f"{GlobalConfig.APPS_PATH}/{session.config.option.app_name}")
|
||||
else GlobalConfig.APPS_PATH
|
||||
)
|
||||
csv_path_dict, no_youqu_mark = walk_apps(walk_dir)
|
||||
|
@ -456,7 +457,8 @@ def pytest_collection_modifyitems(session):
|
|||
{"reason": _tag},
|
||||
)
|
||||
else:
|
||||
logger.error(f"未找到判断是否跳过的自定义方法 <{skip_method}>")
|
||||
logger.error(
|
||||
f"未找到判断是否跳过的自定义方法 <{skip_method}>")
|
||||
add_mark(
|
||||
item,
|
||||
ConfStr.SKIP.value,
|
||||
|
|
|
@ -10,10 +10,11 @@ import os
|
|||
import sys
|
||||
import traceback
|
||||
from argparse import ArgumentParser
|
||||
from setting.globalconfig import GlobalConfig
|
||||
|
||||
os.environ["DISPLAY"] = ":0"
|
||||
os.environ["PIPENV_VERBOSITY"] = "-1"
|
||||
os.environ["XAUTHORITY"] = "/home/uos/.Xauthority"
|
||||
os.environ["XAUTHORITY"] = f"/home/{GlobalConfig.USERNAME}/.Xauthority"
|
||||
|
||||
from setting.globalconfig import SystemPath
|
||||
|
||||
|
@ -22,8 +23,6 @@ for i in SystemPath:
|
|||
continue
|
||||
sys.path.append(i.value)
|
||||
|
||||
from setting.globalconfig import GlobalConfig
|
||||
|
||||
from funnylog import logger
|
||||
|
||||
|
||||
|
|
Loading…
Reference in New Issue