DarkLii
parent
18e66f8978
commit
193d25156c
14
conftest.py
14
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)
|
||||
|
|
@ -443,7 +444,7 @@ def pytest_collection_modifyitems(session):
|
|||
# 如果访问越界，说明这行没有fixed标签或者标签写错位置了，所以正常跳过
|
||||
pass
|
||||
add_mark(item, ConfStr.SKIP.value, (tag,), {})
|
||||
elif not session.config.option.noskip and f"{ConfStr.SKIPIF.value}_" in tag:
|
||||
elif not session.config.option.noskip and f"{ConfStr.SKIPIF.value}_" in tag:
|
||||
tag_list = tag.split("&&")
|
||||
for _tag in tag_list:
|
||||
skip_method, param = _tag.strip(" ").split("-", maxsplit=1)
|
||||
|
|
@ -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,
|
||||
|
|
|
|||
159
manage.py
159
manage.py
|
|
@ -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
|
||||
|
||||
|
||||
|
|
@ -35,59 +34,59 @@ class Manage:
|
|||
|
||||
# pylint: disable=too-many-arguments,too-many-locals,too-many-statements
|
||||
def __init__(
|
||||
self,
|
||||
app=None,
|
||||
keywords=None,
|
||||
tags=None,
|
||||
rerun=None,
|
||||
record_failed_case=None,
|
||||
clean=None,
|
||||
report_formats=None,
|
||||
max_fail=None,
|
||||
log_level=None,
|
||||
timeout=None,
|
||||
resolution=None,
|
||||
debug=None,
|
||||
noskip=None,
|
||||
ifixed=None,
|
||||
send_pms=None,
|
||||
task_id=None,
|
||||
trigger=None,
|
||||
case_file=None,
|
||||
branch=None,
|
||||
deb_path=None,
|
||||
pms_user=None,
|
||||
pms_password=None,
|
||||
suite_id=None,
|
||||
pms_info_file=None,
|
||||
top=None,
|
||||
lastfailed=None,
|
||||
duringfail=None,
|
||||
repeat=None,
|
||||
project_name=None,
|
||||
build_location=None,
|
||||
line=None,
|
||||
client=None,
|
||||
send_code=None,
|
||||
build_env=None,
|
||||
client_password=None,
|
||||
parallel=None,
|
||||
autostart=None,
|
||||
pyid2csv=None,
|
||||
export_csv_file=None,
|
||||
pms2csv=None,
|
||||
csv2pms=None,
|
||||
csv_name=None,
|
||||
pms_link_csv=None,
|
||||
send2task=None,
|
||||
url=None,
|
||||
commit1=None,
|
||||
commit2=None,
|
||||
startdate=None,
|
||||
enddate=None,
|
||||
git_user=None,
|
||||
git_password=None,
|
||||
depth=None,
|
||||
self,
|
||||
app=None,
|
||||
keywords=None,
|
||||
tags=None,
|
||||
rerun=None,
|
||||
record_failed_case=None,
|
||||
clean=None,
|
||||
report_formats=None,
|
||||
max_fail=None,
|
||||
log_level=None,
|
||||
timeout=None,
|
||||
resolution=None,
|
||||
debug=None,
|
||||
noskip=None,
|
||||
ifixed=None,
|
||||
send_pms=None,
|
||||
task_id=None,
|
||||
trigger=None,
|
||||
case_file=None,
|
||||
branch=None,
|
||||
deb_path=None,
|
||||
pms_user=None,
|
||||
pms_password=None,
|
||||
suite_id=None,
|
||||
pms_info_file=None,
|
||||
top=None,
|
||||
lastfailed=None,
|
||||
duringfail=None,
|
||||
repeat=None,
|
||||
project_name=None,
|
||||
build_location=None,
|
||||
line=None,
|
||||
client=None,
|
||||
send_code=None,
|
||||
build_env=None,
|
||||
client_password=None,
|
||||
parallel=None,
|
||||
autostart=None,
|
||||
pyid2csv=None,
|
||||
export_csv_file=None,
|
||||
pms2csv=None,
|
||||
csv2pms=None,
|
||||
csv_name=None,
|
||||
pms_link_csv=None,
|
||||
send2task=None,
|
||||
url=None,
|
||||
commit1=None,
|
||||
commit2=None,
|
||||
startdate=None,
|
||||
enddate=None,
|
||||
git_user=None,
|
||||
git_password=None,
|
||||
depth=None,
|
||||
):
|
||||
self.default_app = app
|
||||
self.default_keywords = keywords
|
||||
|
|
@ -333,7 +332,7 @@ class Manage:
|
|||
Args.tags.value: args.tags or self.default_tags,
|
||||
Args.reruns.value: args.rerun or self.default_rerun,
|
||||
Args.record_failed_case.value: args.record_failed_case
|
||||
or self.default_record_failed_case,
|
||||
or self.default_record_failed_case,
|
||||
Args.clean.value: args.clean or self.default_clean,
|
||||
Args.report_formats.value: args.report_formats or self.default_report_formats,
|
||||
Args.max_fail.value: args.max_fail or self.default_max_fail,
|
||||
|
|
@ -426,9 +425,9 @@ class Manage:
|
|||
pms_link_csv=pms_kwargs.get(Args.pms_link_csv.value),
|
||||
).write_new_csv()
|
||||
elif (
|
||||
pms_kwargs.get(Args.send2task.value)
|
||||
and pms_kwargs.get(Args.task_id.value)
|
||||
and pms_kwargs.get(Args.trigger.value) == "hand"
|
||||
pms_kwargs.get(Args.send2task.value)
|
||||
and pms_kwargs.get(Args.task_id.value)
|
||||
and pms_kwargs.get(Args.trigger.value) == "hand"
|
||||
):
|
||||
from src.pms.send2pms import Send2Pms
|
||||
|
||||
|
|
@ -478,8 +477,8 @@ class Manage:
|
|||
Args.keywords.value: args.keywords or self.default_keywords,
|
||||
Args.tags.value: args.tags or self.default_tags,
|
||||
Args.pyid2csv.value: args.pyid2csv
|
||||
or self.default_pyid2csv
|
||||
or GlobalConfig.PY_ID_TO_CSV,
|
||||
or self.default_pyid2csv
|
||||
or GlobalConfig.PY_ID_TO_CSV,
|
||||
Args.export_csv_file.value: args.export_csv_file or self.default_export_csv_file,
|
||||
"collection_only": True,
|
||||
}
|
||||
|
|
@ -536,10 +535,10 @@ class Manage:
|
|||
|
||||
if git_kwargs.get(Args.url.value):
|
||||
if all(
|
||||
[
|
||||
git_kwargs.get(Args.user.value),
|
||||
git_kwargs.get(Args.password.value),
|
||||
]
|
||||
[
|
||||
git_kwargs.get(Args.user.value),
|
||||
git_kwargs.get(Args.password.value),
|
||||
]
|
||||
):
|
||||
from src.git.clone import sslclone as git_clone
|
||||
else:
|
||||
|
|
@ -548,20 +547,20 @@ class Manage:
|
|||
git_clone(**git_kwargs)
|
||||
|
||||
if all(
|
||||
[
|
||||
git_kwargs.get(Args.app_name.value),
|
||||
any(
|
||||
[
|
||||
all(
|
||||
[
|
||||
git_kwargs.get(Args.start_commit_id.value),
|
||||
git_kwargs.get(Args.end_commit_id.value),
|
||||
]
|
||||
),
|
||||
git_kwargs.get(Args.startdate.value),
|
||||
]
|
||||
),
|
||||
]
|
||||
[
|
||||
git_kwargs.get(Args.app_name.value),
|
||||
any(
|
||||
[
|
||||
all(
|
||||
[
|
||||
git_kwargs.get(Args.start_commit_id.value),
|
||||
git_kwargs.get(Args.end_commit_id.value),
|
||||
]
|
||||
),
|
||||
git_kwargs.get(Args.startdate.value),
|
||||
]
|
||||
),
|
||||
]
|
||||
):
|
||||
from src.git.code_statistics import CodeStatistics
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue