pytest-api-framework-alpha 0.3.23__tar.gz → 0.3.25__tar.gz

{pytest_api_framework_alpha-0.3.23 → pytest_api_framework_alpha-0.3.25}/PKG-INFO

@@ -1,29 +1,29 @@
-Metadata-Version: 2.4
-Name: pytest-api-framework-alpha
-Version: 0.3.23
-Author: alpha
-Author-email: 
-Requires-Python: >=3.6
-Requires-Dist: allure-pytest==2.13.1
-Requires-Dist: allure-python-commons==2.13.1
-Requires-Dist: cn2an==0.5.19
-Requires-Dist: DBUtils==3.1.0
-Requires-Dist: Faker==18.3.2
-Requires-Dist: jsonpath==0.82
-Requires-Dist: pytest==7.2.2
-Requires-Dist: python-dotenv==1.0.1
-Requires-Dist: PyYAML==6.0.1
-Requires-Dist: python-box==7.2.0
-Requires-Dist: pycryptodome==3.21.0
-Requires-Dist: pyotp==2.9.0
-Requires-Dist: pytest-order==1.3.0
-Requires-Dist: PyMySQL==1.1.0
-Requires-Dist: redis==3.5.3
-Requires-Dist: requests==2.25.1
-Requires-Dist: requests-toolbelt==1.0.0
-Requires-Dist: retry==0.9.2
-Requires-Dist: dill==0.3.8
-Requires-Dist: simplejson==3.20.1
-Dynamic: author
-Dynamic: requires-dist
-Dynamic: requires-python
+Metadata-Version: 2.4
+Name: pytest-api-framework-alpha
+Version: 0.3.25
+Author: alpha
+Author-email: 
+Requires-Python: >=3.6
+Requires-Dist: allure-pytest==2.13.1
+Requires-Dist: allure-python-commons==2.13.1
+Requires-Dist: cn2an==0.5.19
+Requires-Dist: DBUtils==3.1.0
+Requires-Dist: Faker==18.3.2
+Requires-Dist: jsonpath==0.82
+Requires-Dist: pytest==7.2.2
+Requires-Dist: python-dotenv==1.0.1
+Requires-Dist: PyYAML==6.0.1
+Requires-Dist: python-box==7.2.0
+Requires-Dist: pycryptodome==3.21.0
+Requires-Dist: pyotp==2.9.0
+Requires-Dist: pytest-order==1.3.0
+Requires-Dist: PyMySQL==1.1.0
+Requires-Dist: redis==3.5.3
+Requires-Dist: requests==2.25.1
+Requires-Dist: requests-toolbelt==1.0.0
+Requires-Dist: retry==0.9.2
+Requires-Dist: dill==0.3.8
+Requires-Dist: simplejson==3.20.1
+Dynamic: author
+Dynamic: requires-dist
+Dynamic: requires-python

{pytest_api_framework_alpha-0.3.23 → pytest_api_framework_alpha-0.3.25}/framework/base_class.py

@@ -20,7 +20,7 @@ from framework.utils.date_util import DateUtil
 from framework.retry_assert import RetryAssert
 from framework.assert_webhook import AssertWebhook
 from framework.http_client import ResponseUtil, HttpClient
-from framework.utils.encrypt import b64_encode, b64_decode
+from framework.utils.encrypt import b64_encode
 from framework.utils.common import snake_to_pascal, SingletonFaker
 from framework.global_attribute import GlobalAttribute, _FRAMEWORK_CONTEXT, CONTEXT
 from framework.exceptions import ValidateException, RenderException, RequestException, GetAccountError, GetAppHttpError
@@ -67,8 +67,8 @@ class BaseTestCase(ExtendBaseTestCase):
                 app_http = getattr(self.http, app)
             except AttributeError as e:
                 raise GetAppHttpError(e)
-            domain = self.context.get(app).get("domain")
             data = RenderData(data).render()
+            domain = self.context.get(app).get("domain")
             data.request.url = self.replace_domain(data.request.url, domain)
             try:
                 self.response = getattr(app_http, account, HttpClient()).request(data=data, **kwargs)
@@ -112,29 +112,30 @@ class BaseTestCase(ExtendBaseTestCase):
             traceback.print_exc()
             pytest.fail(str(e))
 
-    def post(self, app, account, url, data=None, json=None, **kwargs) -> ResponseUtil:
-        domain = self.context.get(app).get("domain")
-        request = {"url": urljoin(domain, url), "data": data, "json": json}
-        request.update({"method": "post", "headers": {}, **kwargs})
-        return self.request(app=app, account=account, data=Box({"request": request}))
-
-    def get(self, app, account, url, params=None, **kwargs) -> ResponseUtil:
-        domain = self.context.get(app).get("domain")
-        request = {"url": urljoin(domain, url), "params": params}
-        request.update({"method": "get", "headers": {}, **kwargs})
-        return self.request(app=app, account=account, data=Box({"request": request}))
-
-    def put(self, app, account, url, data=None, json=None, **kwargs) -> ResponseUtil:
-        domain = self.context.get(app).get("domain")
-        request = {"url": urljoin(domain, url), "data": data, "json": json}
-        request.update({"method": "put", "headers": {}, **kwargs})
-        return self.request(app=app, account=account, data=Box({"request": request}))
-
-    def delete(self, app, account, url, **kwargs) -> ResponseUtil:
-        domain = self.context.get(app).get("domain")
-        request = {"url": urljoin(domain, url)}
-        request.update({"method": "delete", "headers": {}, **kwargs})
-        return self.request(app=app, account=account, data=Box({"request": request}))
+    def _request(self, method, app, account, url, **kwargs) -> ResponseUtil:
+        request = {"method": method, "url": url, "headers": {}, **kwargs}
+        if app:
+            domain = self.context.get(app).get("domain")
+            request["url"] = urljoin(domain, url)
+            return self.request(app=app, account=account, data=Box({"request": request}))
+
+        # 不需要token发送请求的
+        data = RenderData(Box({"request": request})).render()
+        del kwargs["data"]
+        self.response = HttpClient().request(data=data, **kwargs)
+        return self.response
+
+    def get(self, app=None, *, account, url, params=None, **kwargs) -> ResponseUtil:
+        return self._request("get", app, account, url, params=params, **kwargs)
+
+    def post(self, app=None, *, account="", url, data=None, json=None, **kwargs):
+        return self._request("post", app, account, url, data=data, json=json, **kwargs)
+
+    def put(self, app=None, *, account, url, data=None, json=None, **kwargs) -> ResponseUtil:
+        return self._request("put", app, account, url, data=data, json=json, **kwargs)
+
+    def delete(self, app=None, *, account, url, **kwargs) -> ResponseUtil:
+        return self._request("delete", app, account, url, **kwargs)
 
     def mysql_conn(self, db, app=None) -> MysqlDB:
         try:
@@ -366,4 +367,4 @@ class BaseTestCase(ExtendBaseTestCase):
                 "expiry": 0
             }
         )
-        assert self.response.code == 200
+        assert self.response.code == 200

{pytest_api_framework_alpha-0.3.23 → pytest_api_framework_alpha-0.3.25}/framework/conftest.py

@@ -2,7 +2,6 @@ import os
 import re
 import sys
 import copy
-import time
 import platform
 import threading
 import importlib
@@ -14,8 +13,9 @@ from collections import OrderedDict
 from datetime import datetime, timedelta
 from concurrent.futures import ThreadPoolExecutor, as_completed
 
-import dill
 import json
+
+import requests
 import retry
 import allure
 import pytest
@@ -32,7 +32,7 @@ from framework.utils.lark_util import LarkUtil
 from framework.utils.yaml_util import CachedYamlLoader
 from framework.exceptions import MysqlDBError, RedisDBError
 from framework.global_attribute import CONTEXT, CONFIG, _FRAMEWORK_CONTEXT
-from framework.utils.common import snake_to_pascal, get_apps, convert_numbers_to_decimal
+from framework.utils.common import snake_to_pascal, get_apps, convert_numbers_to_decimal, get_short_timestamp,now_iso8601
 
 all_app = get_apps()
 module = importlib.import_module("test_case.conftest")
@@ -159,6 +159,7 @@ def pytest_generate_tests(metafunc):
         case_data["_scenario"] = {"data": {}}
         case_data["_belong_app"] = belong_app
         metafunc.parametrize("data", [case_data, ], ids=[f'{case_data.get("title", "")}#'], scope="function")
+        logger.info(f"{node_id}")
         return
     if case_data.get("request") is None:
         case_data["request"] = dict()
@@ -389,7 +390,7 @@ def pytest_sessionfinish(session, exitstatus):
 
 
 def pytest_runtest_setup(item):
-    allure.dynamic.sub_suite(item.allure_suite_mark)
+    allure.dynamic.sub_suite(getattr(item,"allure_suite_mark"))
     if item.funcargs.get("first"):
         test_object = item.instance
         test_object.context = CONTEXT
@@ -418,8 +419,23 @@ def pytest_runtest_call(item):
     :param item:
     :return:
     """
+    # 获取原始测试数据
     origin_data = item.funcargs.get("data")
     ignore_failed = origin_data.get("_ignore_failed")
+    # 函数式测试用例添加参数data, belong_app
+    http = item.funcargs.get("http")
+    item.funcargs["data"] = item.instance.data = Box(origin_data)
+    item.funcargs["scenario"] = item.instance.scenario = Box(json.loads(json.dumps(
+        convert_numbers_to_decimal(origin_data.get("_scenario")))))
+    _belong_app = origin_data.get("_belong_app")
+    item.funcargs["belong_app"] = item.instance.belong_app = _belong_app
+    item.funcargs["config"] = item.instance.config = CONFIG
+    item.funcargs["context"] = item.instance.context = CONTEXT
+    item.funcargs["retry_assert"] = item.instance.retry_assert = RetryAssert.eventually
+    # 类式测试用例添加参数http，data, belong_app
+    item.instance.http = http
+    logger.info(f"执行用例: {item.nodeid}")
+
     if not ignore_failed:
         # setup方法执行失败，则主动标记用例执行失败，不会执行用例
         if item.funcargs.get("setup_success") is False:
@@ -428,10 +444,14 @@ def pytest_runtest_call(item):
         index = item.session.items.index(item)
         pattern = re.compile(r'^(?P<prefix>.*)::[^:\[\]]+\[.*#(?P<index>\d+)\]$')
         current_match = pattern.match(item.nodeid)
+        if not current_match:
+            return
         current_cls_name = current_match.group('prefix')
         current_index = current_match.group('index')
         prev_item = item.session.items[index - 1]
         prev_match = pattern.match(prev_item.nodeid)
+        if not prev_match:
+            return
         prev_cls_name = prev_match.group("prefix")
         prev_index = prev_match.group("index")
         # 确保是同一个类,并且索引相同
@@ -446,22 +466,6 @@ def pytest_runtest_call(item):
             elif status == "failed":
                 pytest.skip("the previous method execute failed")
 
-    # 获取原始测试数据
-    origin_data = item.funcargs.get("data")
-    logger.info(f"执行用例: {item.nodeid}")
-    # 函数式测试用例添加参数data, belong_app
-    http = item.funcargs.get("http")
-    item.funcargs["data"] = item.instance.data = Box(origin_data)
-    item.funcargs["scenario"] = item.instance.scenario = Box(json.loads(json.dumps(
-        convert_numbers_to_decimal(origin_data.get("_scenario")))))
-    _belong_app = origin_data.get("_belong_app")
-    item.funcargs["belong_app"] = item.instance.belong_app = _belong_app
-    item.funcargs["config"] = item.instance.config = CONFIG
-    item.funcargs["context"] = item.instance.context = CONTEXT
-    item.funcargs["retry_assert"] = item.instance.retry_assert = RetryAssert.eventually
-    # 类式测试用例添加参数http，data, belong_app
-    item.instance.http = http
-
     # 判断token是否过期，过期则重新登录
     expire_time = _FRAMEWORK_CONTEXT.get(app=_belong_app, key="expire_time")
     if expire_time:
@@ -516,14 +520,16 @@ def pytest_runtest_makereport(item, call):
         item.status = report.outcome  # 'passed', 'failed', or 'skipped'
 
 
-def pytest_terminal_summary(terminalreporter, exitstatus, config):
-    """在 pytest 结束后修改统计数据或添加自定义报告"""
-    stats = terminalreporter.stats
-    # 统计各种测试结果
+def pytest_sessionfinish(session, exitstatus):
+    terminalreporter = session.config.pluginmanager.get_plugin("terminalreporter")
+    stats = terminalreporter.stats if terminalreporter else {}
+
     passed = len(stats.get("passed", []))
     failed = len(stats.get("failed", []))
+    error = len(stats.get("error", []))
     skipped = len(stats.get("skipped", []))
     total = passed + failed + skipped
+
     try:
         pass_rate = round(passed / (total - skipped) * 100, 2)
     except ZeroDivisionError:
@@ -560,6 +566,32 @@ def pytest_terminal_summary(terminalreporter, exitstatus, config):
         job_name=CONTEXT.get("mark"),
         env=CONTEXT.get("env")
     )
+    try:
+        requests.request(
+            method="POST",
+            url=settings.REPORT_URL,
+            headers={"Content-Type": "application/json", "Authorization": f"Token {settings.TOKEN}"},
+            json={
+                "total": total,
+                "passed": passed,
+                "failed": failed,
+                "skipped": skipped,
+                "pass_rate": pass_rate,
+                "env": CONTEXT.get("env"),
+                "mark": CONTEXT.get("mark"),
+                "command": CONTEXT.get("command"),
+                "start_time": CONTEXT.get("start_time"),
+                "start_time_format": CONTEXT.get("start_time_format"),
+                "end_time": get_short_timestamp(),
+                "end_time_format": now_iso8601(),
+                "duration": int(get_short_timestamp()) - int(CONTEXT.get("start_time")),
+                "link": os.environ.get("ALLURE_REPORT_URL")
+            }
+
+        )
+    except:
+        logger.error("报告同步失败")
+
 
 
 def pytest_exception_interact(node, call, report):
@@ -877,4 +909,4 @@ def sort(case_items):
 
         all_item_list += item_list
 
-    return all_item_list
+    return all_item_list

{pytest_api_framework_alpha-0.3.23 → pytest_api_framework_alpha-0.3.25}/framework/global_attribute.py

@@ -52,10 +52,8 @@ class GlobalAttribute(object):
 
     def get(self, key, app=None):
         if app:
-            obj = getattr(self, app, None)
-        else:
-            obj = self
-        value = getattr(obj, key, None)
+            return self.get_by_chain(f"{app}.{key}")
+        value = getattr(self, key, None)
         return Box(value) if isinstance(value, dict) else self.list2box(value) if isinstance(value, list) else value
 
     def set(self, key, value, app=None):
@@ -66,6 +64,21 @@ class GlobalAttribute(object):
 
             setattr(self, key, value)
 
+    def get_by_chain(self, key_chain, default=None):
+        """
+        链式格式的key进行get
+        :param key_chain: 链式key，例如 "app.module.key"
+        :param default: 找不到时的默认值
+        :return:
+        """
+        keys = key_chain.split(".")
+        obj = self
+        for key in keys:
+            obj = getattr(obj, key, None)
+            if obj is None:
+                return default
+        return Box(obj) if isinstance(obj, dict) else self.list2box(obj) if isinstance(obj, list) else obj
+
     def set_by_chain(self, key_chain, value):
         """
         链式格式的key进行set

{pytest_api_framework_alpha-0.3.23 → pytest_api_framework_alpha-0.3.25}/framework/http_client.py

@@ -18,7 +18,7 @@ from framework.utils.log_util import logger
 from framework.global_attribute import CONTEXT
 from config.settings import CONSOLE_DETAILED_LOG
 from framework.utils.common import convert_numbers_to_decimal
-from framework.exceptions import RequestException
+from framework.exceptions import RequestException, ValidateException
 
 
 class ResponseUtil(object):
@@ -197,24 +197,26 @@ class HttpClient(object):
             try:
                 data["request"]["headers"].update(kwargs.get("headers", {}))
                 return self.__send_request(data)
+            except ValidateException as e:
+                raise ValidateException(e)
             except Exception as e:
                 raise RequestException(e)
 
         return ResponseUtil(requests.request(headers=self.headers, **kwargs))
 
-    def post(self, app, url, data=None, json=None, **kwargs):
+    def post(self, app=None,*, url, data=None, json=None, **kwargs):
         return self.request(method="post", url=urljoin(CONTEXT.get(app=app, key="domain"), url), data=data,
                             json=json, **kwargs)
 
-    def get(self, app, url, params=None, **kwargs):
+    def get(self, app=None,*, url, params=None, **kwargs):
         return self.request(method="get", url=urljoin(CONTEXT.get(app=app, key="domain"), url), params=params,
                             **kwargs)
 
-    def put(self, app, url, data=None, **kwargs):
+    def put(self, app=None,*, url, data=None, **kwargs):
         return self.request(method="put", url=urljoin(CONTEXT.get(app=app, key="domain"), url), data=data,
                             **kwargs)
 
-    def delete(self, app, url, **kwargs):
+    def delete(self, app=None,*, url, **kwargs):
         return self.request(method="delete", url=urljoin(CONTEXT.get(app=app, key="domain"), url), **kwargs)
 
     def update_headers(self, headers):

{pytest_api_framework_alpha-0.3.23 → pytest_api_framework_alpha-0.3.25}/framework/utils/common.py

@@ -2,10 +2,11 @@ import decimal
 import re
 import os
 import time
+import base64
 import binascii
 from typing import Any
 from decimal import Decimal
-from datetime import datetime
+from datetime import datetime,timezone,timedelta
 from urllib.parse import unquote, quote, quote_plus, unquote_plus
 
 import pyotp
@@ -147,10 +148,16 @@ def valid_b64_format(s):
     :param s:
     :return:
     """
-    b64_re = re.compile(r"^(?:[A-Za-z0-9+/]{4})*(?:[A-Za-z0-9+/]{2}==|[A-Za-z0-9+/]{3}=)?$")
-    if b64_re.match(s):
+    """
+    校验字符串是否为合法 base64
+    """
+    try:
+        if not isinstance(s, str):
+            return False
+        base64.b64decode(s, validate=True)
         return True
-    return False
+    except (binascii.Error, ValueError):
+        return False
 
 
 def hex_to_bytes(hex_str):
@@ -261,3 +268,7 @@ def convert_numbers_to_decimal(obj: Any) -> Any:
 def remove_spaces(s: str) -> str:
     """去掉字符串中的所有空格"""
     return s.replace(" ", "")
+
+def now_iso8601(tz_offset_hours: int = 8) -> str:
+    tz = timezone(timedelta(hours=tz_offset_hours))
+    return datetime.now(tz).isoformat(timespec='seconds')

{pytest_api_framework_alpha-0.3.23 → pytest_api_framework_alpha-0.3.25}/pytest_api_framework_alpha.egg-info/PKG-INFO

@@ -1,29 +1,29 @@
-Metadata-Version: 2.4
-Name: pytest-api-framework-alpha
-Version: 0.3.23
-Author: alpha
-Author-email: 
-Requires-Python: >=3.6
-Requires-Dist: allure-pytest==2.13.1
-Requires-Dist: allure-python-commons==2.13.1
-Requires-Dist: cn2an==0.5.19
-Requires-Dist: DBUtils==3.1.0
-Requires-Dist: Faker==18.3.2
-Requires-Dist: jsonpath==0.82
-Requires-Dist: pytest==7.2.2
-Requires-Dist: python-dotenv==1.0.1
-Requires-Dist: PyYAML==6.0.1
-Requires-Dist: python-box==7.2.0
-Requires-Dist: pycryptodome==3.21.0
-Requires-Dist: pyotp==2.9.0
-Requires-Dist: pytest-order==1.3.0
-Requires-Dist: PyMySQL==1.1.0
-Requires-Dist: redis==3.5.3
-Requires-Dist: requests==2.25.1
-Requires-Dist: requests-toolbelt==1.0.0
-Requires-Dist: retry==0.9.2
-Requires-Dist: dill==0.3.8
-Requires-Dist: simplejson==3.20.1
-Dynamic: author
-Dynamic: requires-dist
-Dynamic: requires-python
+Metadata-Version: 2.4
+Name: pytest-api-framework-alpha
+Version: 0.3.25
+Author: alpha
+Author-email: 
+Requires-Python: >=3.6
+Requires-Dist: allure-pytest==2.13.1
+Requires-Dist: allure-python-commons==2.13.1
+Requires-Dist: cn2an==0.5.19
+Requires-Dist: DBUtils==3.1.0
+Requires-Dist: Faker==18.3.2
+Requires-Dist: jsonpath==0.82
+Requires-Dist: pytest==7.2.2
+Requires-Dist: python-dotenv==1.0.1
+Requires-Dist: PyYAML==6.0.1
+Requires-Dist: python-box==7.2.0
+Requires-Dist: pycryptodome==3.21.0
+Requires-Dist: pyotp==2.9.0
+Requires-Dist: pytest-order==1.3.0
+Requires-Dist: PyMySQL==1.1.0
+Requires-Dist: redis==3.5.3
+Requires-Dist: requests==2.25.1
+Requires-Dist: requests-toolbelt==1.0.0
+Requires-Dist: retry==0.9.2
+Requires-Dist: dill==0.3.8
+Requires-Dist: simplejson==3.20.1
+Dynamic: author
+Dynamic: requires-dist
+Dynamic: requires-python

{pytest_api_framework_alpha-0.3.23 → pytest_api_framework_alpha-0.3.25}/setup.cfg

@@ -1,4 +1,4 @@
-[egg_info]
-tag_build = 
-tag_date = 0
-
+[egg_info]
+tag_build = 
+tag_date = 0
+

{pytest_api_framework_alpha-0.3.23 → pytest_api_framework_alpha-0.3.25}/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 
 setup(
     name="pytest-api-framework-alpha",  # 包名（必须唯一）
-    version="0.3.23",
+    version="0.3.25",
     packages=find_packages(),
     author="alpha",
     author_email="",