Commit b1e1bc16 authored by 张伟男's avatar 张伟男

AI

parent 423e75d3
......@@ -64,9 +64,9 @@ class BaseRequest:
host = self.api_load(path_setting.HOSTYAML_CONFIG)
url_host = ""
if host["develop_host"].get("doctor") is not None:
if host["develop_host"].get("doctor") == "http://doctor.paas-develop.env":
url_host = host['develop_host']['doctor']
elif host["develop_host"].get("backend") is not None:
elif host["develop_host"].get("backend") == "http://backend.paas-develop.env":
url_host = host['develop_host']['backend']
raw = yaml.dump(req) # 将一个python对象生成为yaml文档
......@@ -86,7 +86,7 @@ class BaseRequest:
params=req.get('params'),
# headers=user_headers,
data=req.get('data'),
json=req.get('json'),verify=False
json=req.get('json')
)
return r.json()
......
......@@ -10,10 +10,7 @@ class TestRecomendServices:
data = BaseRequest().api_load(path_setting.ONEIMAGE_RECOMEND_SERVICES_DATA)
recomendservice_case, recomendservice_data = get_ids(data, "recomend_services")
<<<<<<< HEAD
@pytest.mark.skip("跳过测颜值根据五官推荐美购,目前数据是参数是线上的-------------------")
=======
>>>>>>> zwn_test
@pytest.mark.parametrize("param",recomendservice_data,ids=recomendservice_case)
def test_recomend_services(self,param):
r = oneimage_request().recomend_services(param["version"], param["business_tags_names"])
......
......@@ -7,7 +7,6 @@ from all_backend_api.oneimage_request import oneimage_request
class TestShareV4:
<<<<<<< HEAD
"""
测颜值结果页,分享结果
"""
......@@ -15,11 +14,6 @@ class TestShareV4:
sharev4_case, sharev4_data = get_ids(data, "share_v4")
@pytest.mark.skip("跳过,测颜值结果v4,目前数据是线上的-------------------")
=======
data = BaseRequest().api_load(path_setting.ONEIMAGE_SHARE_V4_DATA)
sharev4_case, sharev4_data = get_ids(data, "share_v4")
>>>>>>> zwn_test
@pytest.mark.parametrize("param",sharev4_data,ids=sharev4_case)
def test_share_v4(self,param):
r = oneimage_request().share_v4(param["version"], param["face_id"])
......
Markdown is supported
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