fix: 1.增加执行前显示执行的Python文件数量;2.修复查询Python版本的逻辑;
Description: Log:
This commit is contained in:
parent
5ce50cd121
commit
2daf5dfd99
|
@ -207,7 +207,6 @@ def pytest_configure(config):
|
|||
|
||||
def pytest_sessionstart(session):
|
||||
"""pytest_sessionstart"""
|
||||
# 批量执行之前修改主题
|
||||
if (
|
||||
CmdCtl.run_cmd(
|
||||
"gsettings get com.deepin.dde.appearance gtk-theme",
|
||||
|
@ -229,9 +228,7 @@ def pytest_sessionstart(session):
|
|||
else GlobalConfig.DisplayServer.x11
|
||||
)
|
||||
logger.info(f"当前系统显示协议为 {_display.title()}")
|
||||
# 设置任务栏方向
|
||||
popen("gsettings set com.deepin.dde.dock position bottom")
|
||||
# 记录执行开始时间
|
||||
session.config.option.start_time = datetime.now()
|
||||
|
||||
user = session.config.option.pms_user
|
||||
|
@ -521,6 +518,7 @@ def pytest_collection_finish(session):
|
|||
"""pytest collection finish"""
|
||||
session.item_count = len(session.items)
|
||||
print(f"用例收集数量:\t{session.item_count}")
|
||||
print(f"用例文件数量:\t{len(set([item.fspath for item in session.items]))}")
|
||||
if session.config.option.reruns and not session.config.option.collectonly:
|
||||
print(f"失败重跑次数:\t{session.config.option.reruns}")
|
||||
if session.config.option.max_fail and not session.config.option.collectonly:
|
||||
|
|
3
env.sh
3
env.sh
|
@ -61,7 +61,6 @@ if [ "${env_retry}" = "true" ]; then
|
|||
fi
|
||||
sudo mv /etc/apt/sources.list /etc/apt/sources.list.bak
|
||||
sudo cp sources.list /etc/apt/sources.list && rm -rf sources.list
|
||||
# 替换源之后再执行
|
||||
env
|
||||
sudo mv /etc/apt/sources.list.bak /etc/apt/sources.list
|
||||
fi
|
||||
|
@ -151,7 +150,7 @@ for p in ${pip_array[*]}
|
|||
do
|
||||
pipenv run pip install ${p} -i ${pypi_mirror} > /tmp/env.log 2>&1
|
||||
check_status ${p}
|
||||
pip3 list | grep -v grep | grep ${p}
|
||||
pipenv run pip list | grep -v grep | grep ${p}
|
||||
done
|
||||
echo "${PASSWORD}" | sudo -S su > /dev/null 2>&1
|
||||
cd ${ROOT_DIR}/src/utils/
|
||||
|
|
Loading…
Reference in New Issue