fix: 1、新增playbook.json文件;2、将远程执行的配置项移动到globalconfig.ini里面去;

Description:

Log:
This commit is contained in:
mikigo 2024-04-16 20:24:54 +08:00
parent 02a8f26436
commit 899e8253d0
3 changed files with 66 additions and 6 deletions

18
playbook.json Normal file
View File

@ -0,0 +1,18 @@
{
"repositories": [
{
"url": "",
"branch_or_tag": "",
"depth": "",
"path_to": "",
"user": "",
"password": ""
}
],
"execution_mode": "",
"clients": "",
"slaves": "",
"keywords": "",
"tags": "",
"pms_case_file_path": ""
}

View File

@ -148,7 +148,7 @@ OPENCV_MAX_MATCH_NUMBER = 100
;=============================== SLAVE CONFIG ===================================
;附属的测试机,用例步骤中与其他机器进行交互
; ┌─ slave ${user}@${ip}:${password}
; master ─ slave mikigo@192.168.8.11:admin123
; master ─ slave mikigo@192.168.8.11:admin123
; └─ slave ${user}@${ip}
;如果${password}和前面配置项PASSWORD一样可以不传${user}@${ip}
;多个机器之间用斜线分割:${user}@${ip}:${password}/${user}@${ip}
@ -170,6 +170,37 @@ USER_DATE_DIR = {{HOME}}/.config/browser
;指定浏览器可执行文件路径
EXECUTABLE_PATH = /usr/bin/browser
;=============================== REMOTE CONFIG ===================================
[remote]
;发送代码到测试机不含report目录
SEND_CODE = yes
;搭建测试环境
;如果为yes不管send_code是否为yes都会发送代码到测试机。
BUILD_ENV = no
;测试机密码
CLIENT_PASSWORD = 1
;yes表示所有测试机并行跑执行相同的测试用例。
;no表示测试机分布式执行服务端会根据收集到的测试用例自动分配给各个测试机执行。
PARALLEL = yes
;清理 report 目录
CLEAN_SERVER_REPORT_DIR = no
CLEAN_CLIENT_REPORT_DIR = yes
;测试机轮询次数
SCAN = 300
;远程执行测试机
; ┌─ client ${user}@${ip}:${password}
; youqu-server ┼─ client mikigo@192.168.8.11:admin123
; └─ client ${user}@${ip}
;如果${password}和前面配置项CLIENT_PASSWORD一样可以不传${user}@${ip}
;多个机器之间用斜线分割:${user}@${ip}:${password}/${user}@${ip}
CLIENTS =
;=============================== REPORT CONFIG ===================================
[report]
;测试报告的title

View File

@ -122,6 +122,17 @@ class _GlobalConfig:
USER_DATE_DIR = run_cfg.get("USER_DATE_DIR", default="").replace("{{HOME}}", HOME)
EXECUTABLE_PATH = run_cfg.get("EXECUTABLE_PATH", default="")
# [remote]
remote_cfg = GetCfg(GLOBAL_CONFIG_FILE_PATH, "remote")
SEND_CODE = remote_cfg.get("SEND_CODE", default="yes")
BUILD_ENV = remote_cfg.get("BUILD_ENV", default="no")
CLIENT_PASSWORD = remote_cfg.get("CLIENT_PASSWORD", default="1")
PARALLEL = remote_cfg.get("PARALLEL", default="yes")
CLEAN_SERVER_REPORT_DIR = remote_cfg.get("CLEAN_SERVER_REPORT_DIR", default="no")
CLEAN_CLIENT_REPORT_DIR = remote_cfg.get("CLEAN_CLIENT_REPORT_DIR", default="yes")
SCAN = remote_cfg.get("SCAN", default="300")
CLIENTS = remote_cfg.get("CLIENTS", default="")
# [report]
report_cfg = GetCfg(GLOBAL_CONFIG_FILE_PATH, "report")
REPORT_TITLE = report_cfg.get("REPORT_TITLE", default="YouQu Report")
@ -223,11 +234,11 @@ class _GlobalConfig:
# 显示服务器
# 直接读环境变量XDG_SESSION_TYPE会有问题采用读文件的方式获取
DISPLAY_SERVER = (
popen("cat ~/.xsession-errors | grep XDG_SESSION_TYPE | head -n 1")
.read()
.split("=")[-1]
.strip("\n")
) or getenv("XDG_SESSION_TYPE")
popen("cat ~/.xsession-errors | grep XDG_SESSION_TYPE | head -n 1")
.read()
.split("=")[-1]
.strip("\n")
) or getenv("XDG_SESSION_TYPE")
class DisplayServer:
wayland = "wayland"