'
+ );
+ },
+ adjustImageSize: function (event) {
+ var overImage = this.$(event.target);
+ overImage.width(overImage.width());
+ },
+ onRender: function () {
+ const diffType = settings.get('diffType');
+ this.$('[name="' + this.radioName + '"][value="' + diffType + '"]').prop(
+ 'checked',
+ true,
+ );
+ if (diffType === 'overlay') {
+ this.$('.screen-diff__image-over img').on('load', this.adjustImageSize.bind(this));
+ }
+ },
+ onOverlayMove: function (event) {
+ var pageX = event.pageX;
+ var containerScroll = this.$('.screen-diff__container').scrollLeft();
+ var elementX = event.currentTarget.getBoundingClientRect().left;
+ var delta = pageX - elementX + containerScroll;
+ this.$('.screen-diff__image-over').width(delta);
+ },
+ onDiffTypeChange: function (event) {
+ settings.save('diffType', event.target.value);
+ this.render();
+ },
+ });
+ allure.api.addTestResultBlock(TestResultView, { position: 'before' });
+ allure.api.addAttachmentViewer('application/vnd.allure.image.diff', {
+ View: AttachmentView,
+ icon: 'fa fa-exchange',
+ });
+})();
diff --git a/lib/allure-2.22.0/plugins/screen-diff-plugin/static/styles.css b/lib/allure-2.22.0/plugins/screen-diff-plugin/static/styles.css
new file mode 100644
index 0000000..6cf2219
--- /dev/null
+++ b/lib/allure-2.22.0/plugins/screen-diff-plugin/static/styles.css
@@ -0,0 +1,30 @@
+.screen-diff__switchers {
+ margin-bottom: 1em;
+}
+
+.screen-diff__switchers label + label {
+ margin-left: 1em;
+}
+
+.screen-diff__overlay {
+ position: relative;
+ cursor: col-resize;
+}
+
+.screen-diff__container {
+ overflow-x: auto;
+}
+
+.screen-diff__image-over {
+ top: 0;
+ left: 0;
+ bottom: 0;
+ background: #fff;
+ position: absolute;
+ overflow: hidden;
+ box-shadow: 2px 0 1px -1px #aaa;
+}
+
+.screen-diff-error {
+ color: #fd5a3e;
+}
diff --git a/lib/allure-2.22.0/plugins/trx-plugin/allure-plugin.yml b/lib/allure-2.22.0/plugins/trx-plugin/allure-plugin.yml
new file mode 100644
index 0000000..b0b2657
--- /dev/null
+++ b/lib/allure-2.22.0/plugins/trx-plugin/allure-plugin.yml
@@ -0,0 +1,5 @@
+id: trx
+name: XUnit TRX Plugin
+description: The plugin that adds support for results TRX data format.
+extensions:
+ - io.qameta.allure.trx.TrxPlugin
\ No newline at end of file
diff --git a/lib/allure-2.22.0/plugins/trx-plugin/trx-plugin-2.22.0.jar b/lib/allure-2.22.0/plugins/trx-plugin/trx-plugin-2.22.0.jar
new file mode 100644
index 0000000..68a27a2
Binary files /dev/null and b/lib/allure-2.22.0/plugins/trx-plugin/trx-plugin-2.22.0.jar differ
diff --git a/lib/allure-2.22.0/plugins/xctest-plugin/allure-plugin.yml b/lib/allure-2.22.0/plugins/xctest-plugin/allure-plugin.yml
new file mode 100644
index 0000000..be6b7f4
--- /dev/null
+++ b/lib/allure-2.22.0/plugins/xctest-plugin/allure-plugin.yml
@@ -0,0 +1,5 @@
+id: xctest
+name: XCTest Plugin
+description: The plugin that adds support for results XCTest data format.
+extensions:
+ - io.qameta.allure.xctest.XcTestPlugin
\ No newline at end of file
diff --git a/lib/allure-2.22.0/plugins/xctest-plugin/lib/xmlwise-1.2.11.jar b/lib/allure-2.22.0/plugins/xctest-plugin/lib/xmlwise-1.2.11.jar
new file mode 100644
index 0000000..a2b5f0d
Binary files /dev/null and b/lib/allure-2.22.0/plugins/xctest-plugin/lib/xmlwise-1.2.11.jar differ
diff --git a/lib/allure-2.22.0/plugins/xctest-plugin/xctest-plugin-2.22.0.jar b/lib/allure-2.22.0/plugins/xctest-plugin/xctest-plugin-2.22.0.jar
new file mode 100644
index 0000000..0aa8dec
Binary files /dev/null and b/lib/allure-2.22.0/plugins/xctest-plugin/xctest-plugin-2.22.0.jar differ
diff --git a/lib/allure-2.22.0/plugins/xray-plugin/allure-plugin.yml b/lib/allure-2.22.0/plugins/xray-plugin/allure-plugin.yml
new file mode 100644
index 0000000..231ce80
--- /dev/null
+++ b/lib/allure-2.22.0/plugins/xray-plugin/allure-plugin.yml
@@ -0,0 +1,5 @@
+id: xray
+name: Xray Plugin
+description: The plugin that adds support for Xray integration.
+extensions:
+ - io.qameta.allure.xray.XrayTestRunExportPlugin
diff --git a/lib/allure-2.22.0/plugins/xray-plugin/lib/allure-jira-commons-2.22.0.jar b/lib/allure-2.22.0/plugins/xray-plugin/lib/allure-jira-commons-2.22.0.jar
new file mode 100644
index 0000000..2588599
Binary files /dev/null and b/lib/allure-2.22.0/plugins/xray-plugin/lib/allure-jira-commons-2.22.0.jar differ
diff --git a/lib/allure-2.22.0/plugins/xray-plugin/lib/converter-jackson-2.6.1.jar b/lib/allure-2.22.0/plugins/xray-plugin/lib/converter-jackson-2.6.1.jar
new file mode 100644
index 0000000..94a3747
Binary files /dev/null and b/lib/allure-2.22.0/plugins/xray-plugin/lib/converter-jackson-2.6.1.jar differ
diff --git a/lib/allure-2.22.0/plugins/xray-plugin/lib/jackson-annotations-2.14.1.jar b/lib/allure-2.22.0/plugins/xray-plugin/lib/jackson-annotations-2.14.1.jar
new file mode 100644
index 0000000..e908bd3
Binary files /dev/null and b/lib/allure-2.22.0/plugins/xray-plugin/lib/jackson-annotations-2.14.1.jar differ
diff --git a/lib/allure-2.22.0/plugins/xray-plugin/lib/jackson-core-2.14.1.jar b/lib/allure-2.22.0/plugins/xray-plugin/lib/jackson-core-2.14.1.jar
new file mode 100644
index 0000000..cc02583
Binary files /dev/null and b/lib/allure-2.22.0/plugins/xray-plugin/lib/jackson-core-2.14.1.jar differ
diff --git a/lib/allure-2.22.0/plugins/xray-plugin/lib/jackson-databind-2.14.1.jar b/lib/allure-2.22.0/plugins/xray-plugin/lib/jackson-databind-2.14.1.jar
new file mode 100644
index 0000000..1ac8096
Binary files /dev/null and b/lib/allure-2.22.0/plugins/xray-plugin/lib/jackson-databind-2.14.1.jar differ
diff --git a/lib/allure-2.22.0/plugins/xray-plugin/lib/okhttp-3.12.0.jar b/lib/allure-2.22.0/plugins/xray-plugin/lib/okhttp-3.12.0.jar
new file mode 100644
index 0000000..85fe711
Binary files /dev/null and b/lib/allure-2.22.0/plugins/xray-plugin/lib/okhttp-3.12.0.jar differ
diff --git a/lib/allure-2.22.0/plugins/xray-plugin/lib/okio-1.15.0.jar b/lib/allure-2.22.0/plugins/xray-plugin/lib/okio-1.15.0.jar
new file mode 100644
index 0000000..ab8ab73
Binary files /dev/null and b/lib/allure-2.22.0/plugins/xray-plugin/lib/okio-1.15.0.jar differ
diff --git a/lib/allure-2.22.0/plugins/xray-plugin/lib/retrofit-2.6.1.jar b/lib/allure-2.22.0/plugins/xray-plugin/lib/retrofit-2.6.1.jar
new file mode 100644
index 0000000..211539a
Binary files /dev/null and b/lib/allure-2.22.0/plugins/xray-plugin/lib/retrofit-2.6.1.jar differ
diff --git a/lib/allure-2.22.0/plugins/xray-plugin/xray-plugin-2.22.0.jar b/lib/allure-2.22.0/plugins/xray-plugin/xray-plugin-2.22.0.jar
new file mode 100644
index 0000000..9723d5f
Binary files /dev/null and b/lib/allure-2.22.0/plugins/xray-plugin/xray-plugin-2.22.0.jar differ
diff --git a/lib/allure-2.22.0/plugins/xunit-xml-plugin/allure-plugin.yml b/lib/allure-2.22.0/plugins/xunit-xml-plugin/allure-plugin.yml
new file mode 100644
index 0000000..ca50c51
--- /dev/null
+++ b/lib/allure-2.22.0/plugins/xunit-xml-plugin/allure-plugin.yml
@@ -0,0 +1,5 @@
+id: xunit-xml
+name: XUnit XML v2 Plugin
+description: The plugin that adds support for results in Xunit.net xml data format.
+extensions:
+ - io.qameta.allure.xunitxml.XunitXmlPlugin
\ No newline at end of file
diff --git a/lib/allure-2.22.0/plugins/xunit-xml-plugin/xunit-xml-plugin-2.22.0.jar b/lib/allure-2.22.0/plugins/xunit-xml-plugin/xunit-xml-plugin-2.22.0.jar
new file mode 100644
index 0000000..06fee88
Binary files /dev/null and b/lib/allure-2.22.0/plugins/xunit-xml-plugin/xunit-xml-plugin-2.22.0.jar differ
diff --git a/pytest.ini b/pytest.ini
index 5793c0c..ba1d623 100644
--- a/pytest.ini
+++ b/pytest.ini
@@ -1,10 +1,10 @@
[pytest]
# cmd params
-addopts = -s --capture=sys --self-contained-html --reruns=0 --reruns-delay=5
+addopts = -s --cache-clear --capture=sys --self-contained-html --reruns=2 --reruns-delay=5
disable_test_id_escaping_and_forfeit_all_rights_to_community_support = True
markers =
- test_login: login
- test_login_excel: login excel
- test_new_project: new_project
+ test_login_demo: login
+ test_login_excel_demo: login excel
+ test_new_project_demo: new_project
test_softbot: softbot
auto: auto generate case
\ No newline at end of file
diff --git a/run.py b/run.py
index 74f2310..2676e20 100644
--- a/run.py
+++ b/run.py
@@ -17,55 +17,116 @@
import os
import shutil
import pytest
-from config.project_path import REPORT_DIR, LOG_DIR, AUTO_CASE_DIR, CONF_DIR
+from config.project_path import REPORT_DIR, LOG_DIR, AUTO_CASE_DIR, CONF_DIR, LIB_DIR, ALLURE_RESULTS_DIR, \
+ ALLURE_HTML_DIR
from case_utils.case_handle import get_case_data
from loguru import logger
import click
-from config.settings import REPORT_NAME, LOG_LEVEL
+from config.settings import LOG_LEVEL, ENV_INFO
from datetime import datetime
+from case_utils.platform_handle import PlatformHandle
+from case_utils.get_results_handle import get_test_results_from_pytest_html_report, \
+ get_test_results_from_from_allure_report
+from case_utils.send_result_handle import send_result
+from case_utils.allure_handle import AllureReportBeautiful
+from common_utils.files_handle import zip_file
@click.command()
-@click.option("-env", default=None, help="输入运行环境：test 或 live")
+@click.option("-report", default="allure", help="选择需要生成的测试报告：pytest-html, allure")
+@click.option("-env", default="test", help="输入运行环境：test 或 live")
@click.option("-m", default=None, help="选择需要运行的用例：python.ini配置的名称")
-def run(env, m):
- # 捕获所有日志
- logger.add(os.path.join(LOG_DIR, "runtime_{time}_all.log"), enqueue=True, encoding="utf-8", rotation="00:00",
- format="{time:YYYY-MM-DD HH:mm:ss} {level} From {module}.{function} : {message}")
- # 仅捕获指定级别日志
- logger.add(os.path.join(LOG_DIR, "runtime_{time}_all.log"), enqueue=True, encoding="utf-8", rotation="00:00",
- level=LOG_LEVEL.upper(),
- format="{time:YYYY-MM-DD HH:mm:ss} {level} From {module}.{function} : {message}")
- logger.info("""
- _ _ _ _____ _
- __ _ _ __ (_) / \\ _ _| |_ __|_ _|__ ___| |_
- / _` | "_ \\| | / _ \\| | | | __/ _ \\| |/ _ \\/ __| __|
- | (_| | |_) | |/ ___ \\ |_| | || (_) | | __/\\__ \\ |_
- \\__,_| .__/|_/_/ \\_\\__,_|\\__\\___/|_|\\___||___/\\__|
- |_|
- Starting ... ... ...
- """)
- # 生成case在执行
- if os.path.exists(AUTO_CASE_DIR):
- # 删除文件夹
- shutil.rmtree(AUTO_CASE_DIR)
+def run(env, m, report):
+ try:
+ # ------------------------ 捕获日志 ------------------------
+ # 捕获所有日志
+ logger.add(os.path.join(LOG_DIR, "runtime_{time}_all.log"), enqueue=True, encoding="utf-8", rotation="00:00",
+ format="{time:YYYY-MM-DD HH:mm:ss} {level} From {module}.{function} : {message}")
+ # 仅捕获指定级别日志
+ logger.add(os.path.join(LOG_DIR, "runtime_{time}.log"), enqueue=True, encoding="utf-8", rotation="00:00",
+ level=LOG_LEVEL.upper(),
+ format="{time:YYYY-MM-DD HH:mm:ss} {level} From {module}.{function} : {message}")
+ logger.info("""
+ _ _ _ _____ _
+ __ _ _ __ (_) / \\ _ _| |_ __|_ _|__ ___| |_
+ / _` | "_ \\| | / _ \\| | | | __/ _ \\| |/ _ \\/ __| __|
+ | (_| | |_) | |/ ___ \\ |_| | || (_) | | __/\\__ \\ |_
+ \\__,_| .__/|_/_/ \\_\\__,_|\\__\\___/|_|\\___||___/\\__|
+ |_|
+ Starting ... ... ...
+ """)
+ # ------------------------ 自动生成测试用例 ------------------------
+ # 删除原有的测试用例，以便生成新的测试用例
+ if os.path.exists(AUTO_CASE_DIR):
+ # 删除文件夹
+ shutil.rmtree(AUTO_CASE_DIR)
- if os.path.exists('outputs/report/'):
- shutil.rmtree(path='outputs/report/')
+ # 根据data里面的yaml/excel文件，自动生成测试用例
+ get_case_data()
- # 获取用例
- get_case_data()
- # 执行用例
- current_time = datetime.now().strftime("%Y-%m-%d %H_%M_%S")
- report_name = os.path.join(REPORT_DIR, REPORT_NAME + str(current_time) + ".html")
- report_css = os.path.join(CONF_DIR, "report.css")
- arg_list = [f'--html={report_name}', f"--css={report_css}"]
- if env == "live":
- arg_list.append("--env=live")
- # 执行指定测试用例
- if m is not None:
- arg_list.append(f"-m {m}")
- pytest.main(args=arg_list)
+ # ------------------------ pytest执行测试用例 ------------------------
+ """
+ pytest相关参数：以下也可通过pytest.ini配置
+ --reruns: 失败重跑次数
+ --reruns-delay 失败重跑间隔时间
+ --count: 重复执行次数
+ -v: 显示错误位置以及错误的详细信息
+ -s: 等价于 pytest --capture=no 可以捕获print函数的输出
+ -q: 简化输出信息
+ -m: 运行指定标签的测试用例
+ -x: 一旦错误，则停止运行
+ --cache-clear 清除pytest的缓存，包括测试结果缓存、抓取的fixture实例缓存和收集器信息缓存等
+ --maxfail: 设置最大失败次数，当超出这个阈值时，则不会在执行测试用例
+ "--reruns=3", "--reruns-delay=2"
+ """
+ arg_list = []
+ if env.lower() == "live":
+ arg_list.append("--env=live")
+ # 执行指定测试用例
+ if m is not None:
+ arg_list.append(f"-m {m}")
+ if report.lower() == "allure":
+ arg_list.extend(['-q', '--cache-clear', f'--alluredir={ALLURE_RESULTS_DIR}', '--clean-alluredir'])
+ """
+ allure相关参数：
+ –-alluredir这个选项用于指定存储测试结果的路径
+ """
+ pytest.main(args=arg_list)
+ # ------------------------ 使用allure生成测试报告 ------------------------
+ # 往allure测试结果集目录写入环境配置相关信息
+ ENV_INFO["project_env"] = env
+ AllureReportBeautiful(allure_results_path=ALLURE_RESULTS_DIR).set_report_env(env_info=ENV_INFO)
+ logger.debug("-------开始生成allure测试报告-------")
+ plat = PlatformHandle()
+ # 从LIB_DIR目录中寻找以allure开头的目录作为allure模块的目录，并进入bin目录下
+ allure_path = os.path.join(LIB_DIR, [i for i in os.listdir(LIB_DIR) if i.startswith("allure")][0], "bin")
+ # 根据windows或linux环境判断, 执行指定的命令。plat.allure[0]=cmd, plat.allure[1]=cmd2
+ cmd = plat.allure[1].format(os.path.join(allure_path, plat.allure[0]), ALLURE_RESULTS_DIR, ALLURE_HTML_DIR)
+ # 执行命令行命令，并通过read()方法将命令的结果返回；os.popen() 方法用于从一个命令打开一个管道。在Unix，Windows中有效
+ os.popen(cmd).read()
+ logger.debug("-------美化allure测试报告-------")
+ AllureReportBeautiful(allure_html_path=ALLURE_HTML_DIR).set_windows_title(
+ new_title=ENV_INFO["project_name"])
+ AllureReportBeautiful(allure_html_path=ALLURE_HTML_DIR).set_report_name(new_name=ENV_INFO["report_title"])
+ logger.debug("-------allure测试报告生成完毕，开始发送测试报告-------")
+ # 发送从allure-html获取的测试报告
+ results = get_test_results_from_from_allure_report(ALLURE_HTML_DIR)
+ # 压缩allure-html报告为一个压缩文件zip
+ allure_zip_path = os.path.join(REPORT_DIR, f'{ENV_INFO["report_name"]}.zip')
+ zip_file(in_path=ALLURE_HTML_DIR, out_path=allure_zip_path)
+ send_result(results=results, attachment_path=allure_zip_path)
+ else:
+ current_time = datetime.now().strftime("%Y-%m-%d %H_%M_%S")
+ report_path = os.path.join(REPORT_DIR, ENV_INFO["report_name"] + str(current_time) + ".html")
+ report_css = os.path.join(CONF_DIR, "pytest_html_report.css")
+ arg_list.extend([f'--html={report_path}', f"--css={report_css}"])
+ pytest.main(args=arg_list)
+ logger.debug("-------测试完成，发送测试报告-------")
+ # 发送从pytest-html获取的测试报告
+ results = get_test_results_from_pytest_html_report(report_path)
+ send_result(results=results, attachment_path=report_path)
+ except Exception as e:
+ raise e
if __name__ == '__main__':
diff --git a/test_case/test_manual_case/test_demo.py b/test_case/test_manual_case/test_demo.py
index bbb46a5..0885aaf 100644
--- a/test_case/test_manual_case/test_demo.py
+++ b/test_case/test_manual_case/test_demo.py
@@ -11,11 +11,15 @@ import pytest
from loguru import logger
from pytest_html import extras # 往pytest-html报告中填写额外的内容
from common_utils.func_handle import add_docstring
+import allure
+from case_utils.allure_handle import allure_title, allure_step
# 读取用例数据
-cases = [{"title": "demo cese_01", "user": "flora", "age": 17, "run": False}]
+cases = [{"title": "demo case 01", "user": "flora1", "age": 17, "run": True},
+ {"title": "demo case 02", "user": "lucy", "age": 17, "run": True}]
+@allure.story("demo模块")
@pytest.mark.test_login_demo
@pytest.mark.parametrize("case", cases)
def test_demo(case, extra):
@@ -23,10 +27,14 @@ def test_demo(case, extra):
logger.debug(f"当前执行的用例数据:{case}")
# 给当前测试方法添加文档注释
add_docstring(case.get("title", ""))(test_demo)
+ # 添加用例标题作为allure中显示的用例标题
+ allure_title(case.get("title", ""))
if case.get("run", None):
- assert case["user"] == "flora"
# 将用例数据显示在pytest-html报告中
extra.append(extras.json(case, name="用例数据"))
+ # 在allure报告中显示请求的用例数据
+ allure_step(step_title="用例数据", content=f"{case}")
+ assert case["user"] == "flora"
else:
reason = f"标记了该用例为false，不执行\\n"
logger.warning(f"{reason}")
diff --git a/test_case/test_manual_case/test_login_demo.py b/test_case/test_manual_case/test_login_demo.py
index af76b86..9d628bc 100644
--- a/test_case/test_manual_case/test_login_demo.py
+++ b/test_case/test_manual_case/test_login_demo.py
@@ -9,21 +9,23 @@
import pytest
import os
-from common_utils.yaml_handle import HandleYaml
+from common_utils.yaml_handle import YamlHandle
from config.project_path import DATA_DIR
-from common_utils.base_request import BaseRequest
from case_utils.assert_handle import assert_response, assert_sql
from loguru import logger
-from case_utils.request_data_handle import RequestPreDataHandle, after_extract, case_data_replace, eval_data_process
+from case_utils.request_data_handle import RequestPreDataHandle, RequestHandle
from pytest_html import extras # 往pytest-html报告中填写额外的内容
from common_utils.func_handle import add_docstring
+from case_utils.allure_handle import allure_title
+import allure
# 读取用例数据
-cases = HandleYaml(filename=os.path.join(DATA_DIR, "test_login_demo.yaml")).read_yaml
+cases = YamlHandle(filename=os.path.join(DATA_DIR, "test_login_demo.yaml")).read_yaml
+@allure.story(f'{cases["case_common"]["allure_story"]}')
@pytest.mark.test_login_demo
-@pytest.mark.parametrize("case", cases)
+@pytest.mark.parametrize("case", cases.get("case_info"))
def test_login_demo(case, extra, request):
logger.info("-----------------------------START-开始执行用例-----------------------------")
logger.debug(f"当前执行的用例数据:{case}")
@@ -32,19 +34,17 @@ def test_login_demo(case, extra, request):
env = request.config.getoption("--env")
# 给当前测试方法添加文档注释
add_docstring(case.get("title", ""))(test_login_demo)
+ # 添加用例标题作为allure中显示的用例标题
+ allure_title(case.get("title", ""))
if case.get("run", None):
# 处理请求前的用例数据
case_data = RequestPreDataHandle(case).request_data_handle()
# 将用例数据显示在pytest-html报告中
extra.append(extras.text(str(case_data), name="用例数据"))
# 发送请求
- response = BaseRequest.send_request(case_data)
+ response = RequestHandle(case_data).send_request_extract()
# 将响应数据显示在pytest-html报告中
extra.append(extras.text(str(response.text), name="响应数据"))
- # 请求后，提取后置参数作为全局变量
- after_extract(response, case_data["extract"])
- # 从全局变量中获取最新值，替换数据库断言中的参数
- case_data["assert_sql"] = eval_data_process(case_data_replace(case_data["assert_sql"]))
# 进行响应断言
assert_response(response, case_data["assert_response"])
# 进行数据库断言