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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dg_itest
-Version: 0.0.31.dev2
+Version: 0.0.31.dev4
 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.dev2 → dg_itest-0.0.31.dev4}/dg_itest/utils/logger.py

@@ -37,25 +37,33 @@ 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__}  =================================")
+		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(str(kwargs), name='kwargs', attachment_type=allure.attachment_type.TEXT)
+			allure.attach(kwargs_text, 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=4, separators=(',', ':')).encode().decode("unicode_escape"), name='response')
-				allure.attach(str(result.json()).encode().decode("unicode_escape"), name='response', attachment_type=allure.attachment_type.TEXT)
+			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).encode().decode("unicode_escape"), 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
+				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
 
 	return wrapper

{dg_itest-0.0.31.dev2 → dg_itest-0.0.31.dev4}/dg_itest.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dg_itest
-Version: 0.0.31.dev2
+Version: 0.0.31.dev4
 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.dev2 → dg_itest-0.0.31.dev4}/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.dev2 → dg_itest-0.0.31.dev4}/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.dev2 → dg_itest-0.0.31.dev4}/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.dev2',
+      version='0.0.31.dev4',
       description='接口自动化测试框架',
       long_description=readme,
       long_description_content_type="text/markdown",