pytest-api-framework-alpha 0.1.3__tar.gz → 0.1.4__tar.gz

{pytest_api_framework_alpha-0.1.3 → pytest_api_framework_alpha-0.1.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pytest-api-framework-alpha
-Version: 0.1.3
+Version: 0.1.4
 Author: alpha
 Author-email: 
 Requires-Python: >=3.6

pytest_api_framework_alpha-0.1.4/framework/base_class.py

@@ -0,0 +1,100 @@
+import traceback
+from urllib.parse import urlparse, urlunparse, urljoin
+
+import pytest
+from box import Box
+
+from framework.exit_code import ExitCode
+from framework.db.mysql_db import MysqlDB
+from framework.db.redis_db import RedisDB
+from framework.utils.log_util import logger
+from framework.http_client import ResponseUtil
+from framework.global_attribute import CONFIG, GlobalAttribute
+
+
+class BaseTestCase(object):
+    context: GlobalAttribute = None
+    config: GlobalAttribute = None
+    http = None
+    data: Box = None
+    scenario: Box = None
+    belong_app = None
+    response: ResponseUtil = None
+
+    def request(self, app=None, *, account, data, **kwargs):
+        try:
+            app = self.default_app(app)
+            app_http = getattr(self.http, app)
+            domain = self.context.get(app).get("domain")
+            data.request.url = self.replace_domain(data.request.url, domain)
+            self.response = getattr(app_http, account).request(data=data, kwargs=kwargs)
+            return self.response
+        except AttributeError as e:
+            logger.error(f"app {app} or account {account} no exist: {e}")
+            traceback.print_exc()
+            pytest.exit(ExitCode.APP_OR_ACCOUNT_NOT_EXIST)
+            return None
+
+    def post(self, app, account, url, data=None, json=None, **kwargs):
+        domain = self.context.get(app).get("domain")
+        url = urljoin(domain, url)
+        self.response = getattr(getattr(self.http, app), account).post(app, url, data=data, json=json, **kwargs)
+        return self.response
+
+    def get(self, app, account, url, params=None, **kwargs):
+        domain = self.context.get(app).get("domain")
+        url = urljoin(domain, url)
+        self.response = getattr(getattr(self.http, app), account).get(app, url, params=params, **kwargs)
+        return self.response
+
+    def put(self, app, account, url, data=None, **kwargs):
+        domain = self.context.get(app).get("domain")
+        url = urljoin(domain, url)
+        self.response = getattr(getattr(self.http, app), account).put(app, url, data=data, **kwargs)
+        return self.response
+
+    def delete(self, app, account, url, **kwargs):
+        domain = self.context.get(app).get("domain")
+        url = urljoin(domain, url)
+        self.response = getattr(getattr(self.http, app), account).delete(app, url, **kwargs)
+        return self.response
+
+    def mysql_conn(self, db, app=None):
+        try:
+            return MysqlDB(**CONFIG.get(app=self.default_app(app), key="mysql").get(db))
+        except AttributeError as e:
+            traceback.print_exc()
+            pytest.exit(ExitCode.LOAD_DATABASE_INFO_ERROR)
+
+    def redis_conn(self, db, app=None):
+        try:
+            return RedisDB(**CONFIG.get(app=self.default_app(app), key="redis").get(db))
+        except AttributeError as e:
+            traceback.print_exc()
+            pytest.exit(ExitCode.LOAD_DATABASE_INFO_ERROR)
+
+    def context_set(self, key, value):
+        self.context.set(app=self.belong_app, key=key, value=value)
+
+    def context_get(self, key):
+        return self.context.get(app=self.belong_app, key=key)
+
+    def default_app(self, app):
+        return app or self.belong_app
+
+    @staticmethod
+    def replace_domain(url: str, new_base: str) -> str:
+        """
+        替换 URL 的 scheme 和 netloc（协议和域名）。
+        :param url: 原始 URL
+        :param new_base: 新的 base，如 'https://new.example.com'
+        :return: 替换后的 URL
+        """
+        parsed_url = urlparse(url)
+        new_base_parsed = urlparse(new_base)
+
+        updated_url = parsed_url._replace(
+            scheme=new_base_parsed.scheme,
+            netloc=new_base_parsed.netloc
+        )
+        return urlunparse(updated_url)

{pytest_api_framework_alpha-0.1.3 → pytest_api_framework_alpha-0.1.4}/framework/conftest.py

@@ -20,33 +20,13 @@ from framework.utils.log_util import logger
 from framework.render_data import RenderData
 from framework.utils.yaml_util import YamlUtil
 from framework.allure_report import generate_report
-from framework.utils.common import snake_to_pascal, get_apps
 from framework.global_attribute import CONTEXT, CONFIG, _FRAMEWORK_CONTEXT
+from framework.utils.common import snake_to_pascal, get_apps, convert_numbers_to_decimal
 from config.settings import DATA_DIR, CASES_DIR
 
 all_app = get_apps()
 
 
-def pytest_configure(config):
-    """
-    初始化时被调用，可以用于设置全局状态或配置
-    :param config:
-    :return:
-    """
-
-    for app in all_app:
-        # 将所有app对应环境的基础测试数据加到全局
-        CONTEXT.set_from_yaml(f"config/{app}/context.yaml", CONTEXT.env, app)
-        # 将所有app对应环境的中间件配置加到全局
-        CONFIG.set_from_yaml(f"config/{app}/config.yaml", CONTEXT.env, app)
-    CONTEXT.set(key="all_app", value=all_app)
-    sys.path.append(CASES_DIR)
-
-
-def pytest_addoption(parser):
-    parser.addini(name="ignore_error_and_continue", help="是否忽略失败case,继续执行")
-
-
 def find_data_path_by_case(app, case_file_name):
     """
     基于case文件名称查找与之对应的yml文件路径
@@ -75,6 +55,26 @@ def __init_allure(params):
     allure.dynamic.story(params.get("describe"))
 
 
+def pytest_configure(config):
+    """
+    初始化时被调用，可以用于设置全局状态或配置
+    :param config:
+    :return:
+    """
+
+    for app in all_app:
+        # 将所有app对应环境的基础测试数据加到全局
+        CONTEXT.set_from_yaml(f"config/{app}/context.yaml", CONTEXT.env, app)
+        # 将所有app对应环境的中间件配置加到全局
+        CONFIG.set_from_yaml(f"config/{app}/config.yaml", CONTEXT.env, app)
+    CONTEXT.set(key="all_app", value=all_app)
+    sys.path.append(CASES_DIR)
+
+
+def pytest_addoption(parser):
+    parser.addini(name="ignore_error_and_continue", help="是否忽略失败case,继续执行")
+
+
 def pytest_generate_tests(metafunc):
     """
     生成（多个）对测试函数的参数化调用
@@ -243,7 +243,7 @@ def pytest_runtest_setup(item):
         test_object.http = _FRAMEWORK_CONTEXT.get(key="_http")
         data = item.callspec.params.get("data")
         test_object.data = Box(data)
-        test_object.scenario = Box(data.get("_scenario").get("data"))
+        test_object.scenario = Box(convert_numbers_to_decimal(data.get("_scenario").get("data")))
         test_object.belong_app = data.get("_belong_app")
         test_setup = getattr(test_object, "test_setup", None)
         if test_setup:
@@ -292,14 +292,14 @@ def pytest_runtest_call(item):
     # 函数式测试用例添加参数data, belong_app
     http = item.funcargs.get("http")
     item.funcargs["data"] = Box(rendered_data)
-    item.funcargs["scenario"] = Box(rendered_data.get("_scenario").get("data"))
+    item.funcargs["scenario"] = Box(convert_numbers_to_decimal(rendered_data.get("_scenario").get("data")))
     item.funcargs["belong_app"] = origin_data.get("_belong_app")
     item.funcargs["config"] = CONFIG
     item.funcargs["context"] = CONTEXT
     # 类式测试用例添加参数http，data, belong_app
     item.instance.http = http
     item.instance.data = Box(rendered_data)
-    item.instance.scenario = Box(rendered_data.get("_scenario").get("data"))
+    item.instance.scenario = Box(convert_numbers_to_decimal(rendered_data.get("_scenario").get("data")))
     item.instance.belong_app = origin_data.get("_belong_app")
     item.instance.context = CONTEXT
     item.instance.config = CONFIG

{pytest_api_framework_alpha-0.1.3 → pytest_api_framework_alpha-0.1.4}/framework/global_attribute.py

@@ -1,5 +1,6 @@
 import os
 import traceback
+import yaml
 
 import pytest
 from box import Box
@@ -11,6 +12,18 @@ from framework.utils.log_util import logger
 from framework.utils.common import singleton
 
 
+class NoDatesSafeLoader(yaml.SafeLoader):
+    pass
+
+
+# 禁用 YAML 中的 timestamp 类型自动转换
+for ch in list(NoDatesSafeLoader.yaml_implicit_resolvers):
+    resolvers = NoDatesSafeLoader.yaml_implicit_resolvers[ch]
+    NoDatesSafeLoader.yaml_implicit_resolvers[ch] = [
+        (tag, regexp) for tag, regexp in resolvers if tag != 'tag:yaml.org,2002:timestamp'
+    ]
+
+
 class GlobalAttribute(object):
     def __setattr__(self, key, value):
         super().__setattr__(
@@ -66,7 +79,7 @@ class GlobalAttribute(object):
             if not os.path.exists(file):
                 logger.error(f"{file}文件不存在")
                 pytest.exit(ExitCode.CONTEXT_YAML_NOT_EXIST)
-            self.set_from_dict(dict(Box().from_yaml(filename=file).get(env)), app)
+            self.set_from_dict(dict(Box().from_yaml(filename=file, Loader=NoDatesSafeLoader).get(env)), app)
         except BoxError as e:
             logger.error(f"{file}文件内容不是字典类型:{e}")
             traceback.print_exc()

{pytest_api_framework_alpha-0.1.3 → pytest_api_framework_alpha-0.1.4}/framework/http_client.py

@@ -12,15 +12,16 @@ from framework.extract import Extract
 from framework.utils.log_util import logger
 from framework.global_attribute import CONTEXT
 from requests_toolbelt import MultipartEncoder
+from framework.utils.common import convert_numbers_to_decimal
 
 
 class ResponseUtil(object):
     def __init__(self, response: Response):
         self.response = response
         if isinstance(self.response.json(), dict):
-            self.box = Box(self.response.json())
+            self.box = Box(convert_numbers_to_decimal(self.response.json()))
         elif isinstance(self.response.json(), list):
-            self.box = BoxList(self.response.json())
+            self.box = BoxList(convert_numbers_to_decimal(self.response.json()))
         else:
             self.box = self.response.text
 
@@ -122,8 +123,8 @@ class HttpClient(object):
                     logger.info(f"请求参数json: {request_obj.get('json')}")
 
         with allure.step("响应结果"):
-            with allure.step(f"响应状态码: {self.response.status_code}"):
-                logger.info(f"响应状态码: {self.response.status_code}")
+            with allure.step(f"响应code: {self.response.status_code}"):
+                logger.info(f"响应code: {self.response.status_code}")
             with allure.step(f"响应headers: {self.response.headers}"):
                 logger.info(f"响应headers: {self.response.headers}")
             with allure.step(f"响应body: {self.response.json()}"):

{pytest_api_framework_alpha-0.1.3 → pytest_api_framework_alpha-0.1.4}/framework/startapp.py

@@ -104,7 +104,7 @@ def create_app_session(app):
 
 class {snake_to_pascal(app)}Login(Login):
 
-    def login(self, username, password, secret_key):
+    def login(self, username, password, secret_key, **kwargs):
         client = HttpClient()
         # TODO 需要实现登录逻辑，将登录获取到的token添加到headers中
         token = None

{pytest_api_framework_alpha-0.1.3 → pytest_api_framework_alpha-0.1.4}/framework/utils/common.py

@@ -1,7 +1,10 @@
+import decimal
 import re
 import os
 import time
 import binascii
+from typing import Any
+from decimal import Decimal
 from datetime import datetime
 from urllib.parse import unquote, quote, quote_plus, unquote_plus
 import pyotp
@@ -207,5 +210,24 @@ def get_apps():
             os.path.isdir(os.path.join(CONFIG_DIR, name)) and not name.startswith(("__", "."))]
 
 
+def convert_numbers_to_decimal(obj: Any) -> Any:
+    if isinstance(obj, str):
+        stripped = obj.replace(",", "")
+        try:
+            return Decimal(stripped)
+        except Exception:
+            return obj
+    elif isinstance(obj, dict):
+        return {k: convert_numbers_to_decimal(v) for k, v in obj.items()}
+    elif isinstance(obj, list):
+        return [convert_numbers_to_decimal(item) for item in obj]
+    elif isinstance(obj, (int, float)) and not isinstance(obj, bool):
+        return Decimal(str(obj))
+    else:
+        return obj
+
+
 if __name__ == '__main__':
-    print(get_apps())
+    a = decimal.Decimal("123")
+    print(a)
+    assert a == 123

{pytest_api_framework_alpha-0.1.3 → pytest_api_framework_alpha-0.1.4}/pytest_api_framework_alpha.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pytest-api-framework-alpha
-Version: 0.1.3
+Version: 0.1.4
 Author: alpha
 Author-email: 
 Requires-Python: >=3.6

{pytest_api_framework_alpha-0.1.3 → pytest_api_framework_alpha-0.1.4}/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 
 setup(
     name="pytest-api-framework-alpha",  # 包名（必须唯一）
-    version="0.1.3",
+    version="0.1.4",
     packages=find_packages(),
     author="alpha",
     author_email="",
@@ -31,5 +31,4 @@ setup(
         "pytest-timeout==2.2.0",
         "dill==0.3.8"
     ]
-
 )

pytest_api_framework_alpha-0.1.3/framework/base_class.py

@@ -1,74 +0,0 @@
-import traceback
-
-import pytest
-from box import Box
-
-from framework.exit_code import ExitCode
-from framework.db.mysql_db import MysqlDB
-from framework.db.redis_db import RedisDB
-from framework.utils.log_util import logger
-from framework.http_client import ResponseUtil
-from framework.global_attribute import CONFIG, GlobalAttribute
-
-
-class BaseTestCase(object):
-    context: GlobalAttribute = None
-    config: GlobalAttribute = None
-    http = None
-    data: Box = None
-    scenario: Box = None
-    belong_app = None
-    response: ResponseUtil = None
-
-    def request(self, app=None, *, account, data, **kwargs):
-        try:
-            app = self.default_app(app)
-            app_http = getattr(self.http, app)
-            self.response = getattr(app_http, account).request(data=data, keyword=kwargs)
-            return self.response
-        except AttributeError as e:
-            logger.error(f"app {app} or account {account} no exist: {e}")
-            traceback.print_exc()
-            pytest.exit(ExitCode.APP_OR_ACCOUNT_NOT_EXIST)
-            return None
-
-    def post(self, app, account, url, data=None, json=None, **kwargs):
-        return getattr(getattr(self.http, app), account).post(app, url, data=data, json=json, **kwargs)
-
-    def get(self, app, account, url, params=None, **kwargs):
-        return getattr(getattr(self.http, app), account).get(app, url, params=params, **kwargs)
-
-    def put(self, app, account, url, data=None, **kwargs):
-        return getattr(getattr(self.http, app), account).put(app, url, data=data, **kwargs)
-
-    def delete(self, app, account, url, **kwargs):
-        return getattr(getattr(self.http, app), account).delete(app, url, **kwargs)
-
-    def mysql_conn(self, db, app=None):
-        try:
-            return MysqlDB(**CONFIG.get(app=self.default_app(app), key="mysql").get(db))
-        except AttributeError as e:
-            traceback.print_exc()
-            pytest.exit(ExitCode.LOAD_DATABASE_INFO_ERROR)
-
-    def redis_conn(self, db, app=None):
-        try:
-            return RedisDB(**CONFIG.get(app=self.default_app(app), key="redis").get(db))
-        except AttributeError as e:
-            traceback.print_exc()
-            pytest.exit(ExitCode.LOAD_DATABASE_INFO_ERROR)
-
-    def context_set(self, app=None, *, key, value):
-        app = self.default_app(app)
-        self.context.set(app=app, key=key, value=value)
-
-    def context_get(self, app=None, *, key):
-        app = self.default_app(app)
-        return self.context.get(app=app, key=key)
-
-    def config_get(self, app=None, *, key):
-        app = self.default_app(app)
-        return self.config.get(app=app, key=key)
-
-    def default_app(self, app):
-        return app or self.belong_app