dg-itest 0.0.31.dev3__tar.gz → 0.0.31.dev5__tar.gz

{dg_itest-0.0.31.dev3 → dg_itest-0.0.31.dev5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dg_itest
-Version: 0.0.31.dev3
+Version: 0.0.31.dev5
 Summary: 接口自动化测试框架
 Home-page: https://github.com/yaitza/dg-itest
 Download-URL: https://github.com/yaitza/dg-itest/releases
@@ -41,7 +41,7 @@ Requires-Dist: py==1.11.0
 Requires-Dist: Pygments==2.15.1
 Requires-Dist: pytest==8.4.1
 Requires-Dist: python-common-cache==0.1
-Requires-Dist: PyYAML==6.0
+Requires-Dist: PyYAML==6.0.2
 Requires-Dist: readme-renderer==37.3
 Requires-Dist: referencing==0.36.2
 Requires-Dist: requests==2.28.2

{dg_itest-0.0.31.dev3 → dg_itest-0.0.31.dev5}/dg_itest/servers/dg_servers/dg_requests.py

@@ -6,7 +6,7 @@
 
 import requests
 
-from dg_itest.utils.logger import logger, allure_log
+from dg_itest.utils.logger import allure_log, log_attach
 from dg_itest import host_url
 
 class DgRequests(object):
@@ -24,6 +24,8 @@ class DgRequests(object):
 		if headers is not None:
 			request_headers.update(headers)
 		# logger.info(f'inputs params: {str(kwargs)}')
+		log_attach(str(kwargs), name='kwargs')
 		result = requests.request(method, url=self.server_url + url, headers=request_headers, **kwargs)
 		# logger.info(f'response: {str(result.json())}')
+		log_attach(str(result.json()), name='response')
 		return result

{dg_itest-0.0.31.dev3 → dg_itest-0.0.31.dev5}/dg_itest/utils/logger.py

@@ -37,24 +37,13 @@ def log_attach(log_data: str, name='compare_result'):
 def allure_log(func):
 	@wraps(func)
 	def wrapper(*args, **kwargs):
-		try:
-			start = 1000 * time.time()
-			logger.debug(f"========================  Begin: {func.__name__}  =================================")
-			logger.debug(str(kwargs))
-			allure.attach(json.dumps(kwargs, sort_keys=True, indent=2, ensure_ascii=False), name='kwargs', attachment_type=allure.attachment_type.TEXT)
-			result = func(*args, **kwargs)
-
-			if hasattr(result, 'json'):
-				logger.debug(str(result.json()))
-				allure.attach(json.dumps(result.json(), sort_keys=True, indent=2, ensure_ascii=False), name='response', attachment_type=allure.attachment_type.TEXT)
-			else:
-				logger.debug(str(result))
-				allure.attach(str(result), name='response', attachment_type=allure.attachment_type.TEXT)
-			end = 1000 * time.time()
-			logger.debug(f"=============   End: {func.__name__}; cost time: {end - start}ms   =============")
-			return result
-		except Exception as e:
-			logger.error(repr(e))
-			raise e
+		start = 1000 * time.time()
+		logger.debug(f"========================  Begin: {func.__name__}  =================================")
+
+		result = func(*args, **kwargs)
+  
+		end = 1000 * time.time()
+		logger.debug(f"=============   End: {func.__name__}; cost time: {end - start}ms   =============")
+		return result
 
 	return wrapper

{dg_itest-0.0.31.dev3 → dg_itest-0.0.31.dev5}/dg_itest.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dg_itest
-Version: 0.0.31.dev3
+Version: 0.0.31.dev5
 Summary: 接口自动化测试框架
 Home-page: https://github.com/yaitza/dg-itest
 Download-URL: https://github.com/yaitza/dg-itest/releases
@@ -41,7 +41,7 @@ Requires-Dist: py==1.11.0
 Requires-Dist: Pygments==2.15.1
 Requires-Dist: pytest==8.4.1
 Requires-Dist: python-common-cache==0.1
-Requires-Dist: PyYAML==6.0
+Requires-Dist: PyYAML==6.0.2
 Requires-Dist: readme-renderer==37.3
 Requires-Dist: referencing==0.36.2
 Requires-Dist: requests==2.28.2

{dg_itest-0.0.31.dev3 → dg_itest-0.0.31.dev5}/dg_itest.egg-info/requires.txt

@@ -32,7 +32,7 @@ py==1.11.0
 Pygments==2.15.1
 pytest==8.4.1
 python-common-cache==0.1
-PyYAML==6.0
+PyYAML==6.0.2
 readme-renderer==37.3
 referencing==0.36.2
 requests==2.28.2

{dg_itest-0.0.31.dev3 → dg_itest-0.0.31.dev5}/requirements.txt

@@ -32,7 +32,7 @@ py==1.11.0
 Pygments==2.15.1
 pytest==8.4.1
 python-common-cache==0.1
-PyYAML==6.0
+PyYAML==6.0.2
 readme-renderer==37.3
 referencing==0.36.2
 requests==2.28.2

{dg_itest-0.0.31.dev3 → dg_itest-0.0.31.dev5}/setup.py

@@ -19,7 +19,7 @@ with open("README.md", mode='r', encoding="utf-8") as f:
     readme = f.read()
 
 setup(name='dg_itest',
-      version='0.0.31.dev3',
+      version='0.0.31.dev5',
       description='接口自动化测试框架',
       long_description=readme,
       long_description_content_type="text/markdown",