Merge branch 'common_dev' into zhanghui_dev

all_backend_api/gmai_request.py

+import path_setting
+from in_common.base_request import BaseRequest
+
+
+class gmai_request(BaseRequest):
+    def __init__(self):
+        self.data = self.api_load(path_setting.GMAI_SKIN_NEWREPORT_CONFIG)
+
+    # 测颜值结果页
+    def skin_newReport(self,version,image_url):
+        self.params["version"] = version
+        self.params["image_url"] = image_url
+
+        return self.api_send(self.data["skin_newReport"])
+
+    # 模拟双眼皮
+    def eyelids_plastic(self,version,image_url,style_id):
+        self.params["version"] = version
+        self.params["image_url"] = image_url
+        self.params["style_id"] = style_id
+
+        return self.api_send(self.data["eyelids_plastic"])
+
+
+
+# if __name__ == '__main__':
+#     # print(gmai_request().skin_newReport("7.43.0","https://pic.igengmei.com/2021/05/11/1440/25e4bf45673f-s"))
+#     # print(gmai_request().eyelids_plastic("7.43.0", "2021/05/12/1457/cdbe8652117d","3"))

all_backend_api/gmai_request.yaml

+skin_newReport:
+  method: post
+  url: /gm_ai/skin/new_report
+  params:
+    version: ${version}
+  data:
+    image_url: ${image_url}
+
+
+eyelids_plastic:
+  method: post
+  url: /gm_ai/eyelids/plastic
+  params:
+    version: ${version}
+  data:
+    image_url: ${image_url}
+    style_id: ${style_id}

in_common/base_request.py

@@ -64,9 +64,9 @@ class BaseRequest:
         host = self.api_load(path_setting.HOSTYAML_CONFIG)
         url_host = ""
 
-        if host["develop_host"].get("doctor") == "http://doctor.paas-develop.env":
+        if host["develop_host"].get("doctor") is not None:
             url_host = host['develop_host']['doctor']
-        elif host["develop_host"].get("backend") == "http://backend.paas-develop.env":
+        elif host["develop_host"].get("backend") is not None:
             url_host = host['develop_host']['backend']
 
         raw = yaml.dump(req)  # 将一个python对象生成为yaml文档

path_setting.py

@@ -50,6 +50,12 @@ ONEIMAGE_SHARE_V4_DATA = os.path.join(BASE_DIR, "backend_auto/test_backend_data/
 # 测颜值根据五官推荐美购
 ONEIMAGE_RECOMEND_SERVICES_DATA = os.path.join(BASE_DIR, "backend_auto/test_backend_data/oneimage_data", "recomend_services.yaml")
 
+# 测肤结果页
+GMAI_SKIN_NEWREPORT_CONFIG = os.path.join(BASE_DIR, "backend_auto/all_backend_api", "gmai_request.yaml")
+GMAI_SKIN_NEWREPORT_DATA = os.path.join(BASE_DIR, "backend_auto/test_backend_data/gmai_data", "skin_newReport.yaml")
+# 模拟双眼皮
+GMAI_EYELIDS_PLASTIC_DATA = os.path.join(BASE_DIR, "backend_auto/test_backend_data/gmai_data", "eyelids_plastic.yaml")
+
 LOGIN_PASSWD = os.path.join(BASE_DIR, "backend_auto/test_backend_data/accounts_data", "login_passwd.yaml")
 LOGIN_CONFIG = os.path.join(BASE_DIR, "backend_auto/all_backend_api", "accounts_request.yaml")
 

test_backend_case/gmai_case/test_eyelids_plastic.py

+import pytest
+
+from ids_list import get_ids
+import path_setting
+from in_common.base_request import BaseRequest
+from all_backend_api.gmai_request import gmai_request
+
+# 模拟双眼皮效果
+class TestEyelidsPlastic:
+    data = BaseRequest().api_load(path_setting.GMAI_EYELIDS_PLASTIC_DATA)
+    eyelidsplastic_case, eyelidsplastic_data = get_ids(data, "eyelids_plastic")
+
+    @pytest.mark.parametrize("param",eyelidsplastic_data,ids=eyelidsplastic_case)
+    def test_skinnewReport(self,param):
+        r = gmai_request().eyelids_plastic(param["version"], param["image_url"],param["style_id"])
+        assert r["error"] == 0
+        print("模拟双眼皮效果图片：  ",r["data"]["plastic_image_url"])
\ No newline at end of file

test_backend_case/gmai_case/test_skin_newreport.py

+import pytest
+
+from ids_list import get_ids
+import path_setting
+from in_common.base_request import BaseRequest
+from all_backend_api.gmai_request import gmai_request
+
+# 测肤结果页
+class TestSkinNewReport:
+    data = BaseRequest().api_load(path_setting.GMAI_SKIN_NEWREPORT_DATA)
+    skinnewReport_case, skinnewReport_data = get_ids(data, "skin_newReport")
+
+    @pytest.mark.parametrize("param",skinnewReport_data,ids=skinnewReport_case)
+    def test_skinnewReport(self,param):
+        r = gmai_request().skin_newReport(param["version"], param["image_url"])
+        if r["error"] == 0:
+            data = r.get("data")
+
+            # 大家都在买
+            packages = data.get("packages")
+            assert len(packages) == 6
+
+            # 皮肤检测结果
+            disadvantage_tabs = data.get("disadvantage_tabs")
+            result_word = disadvantage_tabs[0].get("result_word")
+            assert result_word == "色素型黑眼圈"
+
+
+

test_backend_data/gmai_data/eyelids_plastic.yaml

+eyelids_plastic:
+#模拟双眼皮效果
+  -
+    case: "平行双眼皮效果"
+    version: "7.43.0"
+    image_url: "2021/05/12/1457/cdbe8652117d"
+    style_id: "1"
+
+
+  -
+    case: "开扇双眼皮效果"
+    version: "7.43.0"
+    image_url: "2021/05/12/1457/cdbe8652117d"
+    style_id: "3"
\ No newline at end of file

test_backend_data/gmai_data/skin_newReport.yaml

+skin_newReport:
+#测颜值根据五官推荐美购
+  -
+    case: "请求成功"
+    version: "7.43.0"
+    image_url: "https://pic.igengmei.com/2021/05/11/1440/25e4bf45673f-s"
+    assert: 1
\ No newline at end of file

test_backend_data/oneimage_data/recomend_services.yaml

@@ -3,5 +3,5 @@ recomend_services:
   -
     case: "请求成功，返回个数正确"
     version: "7.42.2"
-    business_tags_names: '[["鼻翼缩小","玻尿酸隆鼻","耳软骨隆鼻","鼻中隔软骨隆鼻"]]'
-    assert: 1
\ No newline at end of file
+    business_tags_names: '[["玻尿酸垫下巴","自体脂肪垫下巴","硅胶垫下巴","膨体垫下巴"],["半永久纹眉","植眉"]]'
+    assert: 2
\ No newline at end of file