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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dg_itest
-Version: 0.0.31.dev4
+Version: 0.0.31.dev5
 Summary: 接口自动化测试框架
 Home-page: https://github.com/yaitza/dg-itest
 Download-URL: https://github.com/yaitza/dg-itest/releases

{dg_itest-0.0.31.dev4 → 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.dev4 → dg_itest-0.0.31.dev5}/dg_itest/utils/logger.py

@@ -39,29 +39,9 @@ def allure_log(func):
 	def wrapper(*args, **kwargs):
 		start = 1000 * time.time()
 		logger.debug(f"========================  Begin: {func.__name__}  =================================")
-  
-		with allure.step(f"{func.__name__}"):
-			kwargs_text = json.dumps(kwargs, sort_keys=True, indent=2, ensure_ascii=False)
-			logger.debug(str(kwargs))
-			allure.attach(kwargs_text, name="kwargs", attachment_type=allure.attachment_type.TEXT)
-
-			result = func(*args, **kwargs)
-
-			if hasattr(result, "json"):
-				try:
-					payload = result.json()
-				except ValueError:
-					payload = result.text
-
-				response_text = json.dumps(payload, sort_keys=True, indent=2, ensure_ascii=False) \
-					if isinstance(payload, dict) else str(payload)
-
-				logger.debug(response_text)
-				allure.attach(response_text, 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)
 
+		result = func(*args, **kwargs)
+  
 		end = 1000 * time.time()
 		logger.debug(f"=============   End: {func.__name__}; cost time: {end - start}ms   =============")
 		return result

{dg_itest-0.0.31.dev4 → 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.dev4
+Version: 0.0.31.dev5
 Summary: 接口自动化测试框架
 Home-page: https://github.com/yaitza/dg-itest
 Download-URL: https://github.com/yaitza/dg-itest/releases

{dg_itest-0.0.31.dev4 → 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.dev4',
+      version='0.0.31.dev5',
       description='接口自动化测试框架',
       long_description=readme,
       long_description_content_type="text/markdown",