Commit 5d1069b7 authored by liguangyu06's avatar liguangyu06
Browse files

优化

parent e671315b
...@@ -68,9 +68,14 @@ if result["success"]: ...@@ -68,9 +68,14 @@ if result["success"]:
# print(check_dict) # print(check_dict)
# 断言实际结果中是否包含预期结果的内容 # 断言实际结果中是否包含预期结果的内容
commonFuc().check_result(check_dict, result) commonFuc().check_result(check_dict, result)
else: elif result["code"] == "FRESENIUS_GROUP_ERROR":
# 获取预期结果 # 获取预期结果
check_dict = commonFuc().get_business_data(module, "checkDict16") check_dict = commonFuc().get_business_data(module, "checkDict16")
# print(check_dict) # print(check_dict)
# 断言实际结果中是否包含预期结果的内容 # 断言实际结果中是否包含预期结果的内容
commonFuc().check_result(check_dict, result) commonFuc().check_result(check_dict, result)
else:
# 获取预期结果
check_dict = commonFuc().get_business_data(module, "checkDict11_1")
# 断言实际结果中是否包含预期结果的内容
commonFuc().check_result(check_dict, result)
...@@ -53,7 +53,13 @@ api_time = float(result.elapsed.total_seconds()) ...@@ -53,7 +53,13 @@ api_time = float(result.elapsed.total_seconds())
result = json.loads(result.content) result = json.loads(result.content)
result["api_time"] = api_time result["api_time"] = api_time
# 获取预期结果 if result["code"] == "FRESENIUS_GROUP_ERROR":
check_dict = commonFuc().get_business_data(module, "checkDict14") # 获取预期结果
# 断言实际结果中是否包含预期结果的内容 check_dict = commonFuc().get_business_data(module, "checkDict14")
commonFuc().check_result(check_dict, result) # 断言实际结果中是否包含预期结果的内容
commonFuc().check_result(check_dict, result)
else:
# 获取预期结果
check_dict = commonFuc().get_business_data(module, "checkDict11_1")
# 断言实际结果中是否包含预期结果的内容
commonFuc().check_result(check_dict, result)
\ No newline at end of file
...@@ -49,8 +49,13 @@ if result["success"]: ...@@ -49,8 +49,13 @@ if result["success"]:
check_dict = commonFuc().get_business_data(module, "checkDict17") check_dict = commonFuc().get_business_data(module, "checkDict17")
# 断言实际结果中是否包含预期结果的内容 # 断言实际结果中是否包含预期结果的内容
commonFuc().check_result(check_dict, result) commonFuc().check_result(check_dict, result)
else: elif result["code"] == "FRESENIUS_GROUP_ERROR":
# 获取预期结果 # 获取预期结果
check_dict = commonFuc().get_business_data(module, "checkDict17_1") check_dict = commonFuc().get_business_data(module, "checkDict17_1")
# 断言实际结果中是否包含预期结果的内容 # 断言实际结果中是否包含预期结果的内容
commonFuc().check_result(check_dict, result)
else:
# 获取预期结果
check_dict = commonFuc().get_business_data(module, "checkDict11_1")
# 断言实际结果中是否包含预期结果的内容
commonFuc().check_result(check_dict, result) commonFuc().check_result(check_dict, result)
\ No newline at end of file
...@@ -41,7 +41,14 @@ result = requests.post(url, json=request_body, headers=headers) ...@@ -41,7 +41,14 @@ result = requests.post(url, json=request_body, headers=headers)
api_time = float(result.elapsed.total_seconds()) api_time = float(result.elapsed.total_seconds())
result = json.loads(result.content) result = json.loads(result.content)
result["api_time"] = api_time result["api_time"] = api_time
# 获取预期结果
check_dict = commonFuc().get_business_data(module, "checkDict8") if result["success"]:
# 断言实际结果中是否包含预期结果的内容 # 获取预期结果
commonFuc().check_result(check_dict, result) check_dict = commonFuc().get_business_data(module, "checkDict8")
# 断言实际结果中是否包含预期结果的内容
commonFuc().check_result(check_dict, result)
else:
# 获取预期结果
check_dict = commonFuc().get_business_data(module, "checkDict11_1")
# 断言实际结果中是否包含预期结果的内容
commonFuc().check_result(check_dict, result)
\ No newline at end of file
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment