处理path_setting.py文件冲突

all_backend_api/account_request.py

@@ -4,7 +4,7 @@ from in_common.base_request import BaseRequest
 
 class account_request(BaseRequest):
     def __init__(self):
-        self.data = self.api_load(path_setting.APYAML_CONFIG)
+        self.loginvfc = self.api_load(path_setting.APYAML_CONFIG)
 
     def login_vfc(self,current_city_id,phone_num,vfc_code,vfc_type="",face_token=""):
         self.params["current_city_id"] = current_city_id
@@ -12,7 +12,8 @@ class account_request(BaseRequest):
         self.params["vfc_code"] = vfc_code
         self.params["vfc_type"] = vfc_type
         self.params["face_token"] = face_token
-        return self.api_send(self.data["login_vfc"])
+        return self.api_send(self.loginvfc["login_vfc"])
+
 
 
 if __name__ == '__main__':

all_backend_api/hospitals_request.py

+import path_setting
+from in_common.base_request import BaseRequest
+
+
+class hospitals_request(BaseRequest):
+
+    def __init__(self):
+        self.data = self.api_load(path_setting.HDYAML_CONFIG)
+
+    def detail(self):
+        return self.api_send(self.data["detail"])
+
+
+if __name__ == '__main__':
+    print(hospitals_request().detail())
\ No newline at end of file

all_backend_api/hospitals_request.yaml

+detail:
+  method: get
+  url: /api/hospitals/bjxyjcpfbyy/detail
+  params: {}
+
+  data: {}
+  json: {}

all_doctor_api/web2_request.py

+import path_setting
+from in_common.base_request import BaseRequest
+
+
+class web2_request(BaseRequest):
+    def __init__(self):
+        self.data = self.api_load(path_setting.SERVICE_URL)
+
+    def service_list(self, page,pagesize,is_online):
+        self.params["page"] = page
+        self.params["pagesize"] = pagesize
+        self.params["is_online"] = is_online
+
+        return self.api_send(self.data["service_list"])
+
+    if __name__ == '__main__':
+        print(web2_request().service_list("1", "10", "-1"))
\ No newline at end of file

all_doctor_api/web2_request.yaml

+service_list:
+  method: get
+  url: /api/web2/service/list
+  params:
+    page: ${page}
+    pagesize: ${pagesize}
+    is_online: ${is_online}
+  data: {}
+  json: {}
\ No newline at end of file

conftest.py

@@ -6,3 +6,5 @@ def pytest_collection_modifyitems(items):
     for item in items:
         item.name = item.name.encode("utf-8").decode("unicode_escape")
         item._nodeid = item.nodeid.encode("utf-8").decode("unicode_escape")
+
+

host.yaml

 develop_host:
   url: http://backend.paas-develop.env
+#  url: http://doctor.paas-develop.env/

path_setting.py

@@ -4,17 +4,28 @@ BASE_DIR = os.path.dirname(os.path.dirname(__file__))
 sys.path.append(BASE_DIR)
 
 HOSTYAML_CONFIG = os.path.join(BASE_DIR, "backend_auto", "host.yaml")
+
 APYAML_CONFIG = os.path.join(BASE_DIR, "backend_auto/all_backend_api", "account_request.yaml")
 LOGIN_VFC = os.path.join(BASE_DIR, "backend_auto/test_backend_data/account_data", "login_vfc.yaml")
+
+#搜索首页-热门搜索
 KEYWORDS_CONFIG = os.path.join(BASE_DIR, "backend_auto/all_backend_api", "search_request.yaml")
 KEYWORDS = os.path.join(BASE_DIR, "backend_auto/test_backend_data/search_data", "keywords.yaml")
 
+SERVICE_DATA=os.path.join(BASE_DIR, "backend_auto/test_doctor_data/web2_data", "service_list.yaml")
+SERVICE_URL=os.path.join(BASE_DIR, "backend_auto/all_doctor_api", "web2_request.yaml")
+
+
 FEED_INDEXV9_CONFIG = os.path.join(BASE_DIR, "backend_auto/all_backend_api", "feed_request.yaml")
 FEED_INDEXV9_DATA = os.path.join(BASE_DIR, "backend_auto/test_backend_data/feed_data", "index_v9.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")
 
+#医院主页详情
+HDYAML_CONFIG = os.path.join(BASE_DIR, "backend_auto/all_backend_api", "hospitals_request.yaml")
+HOSPITAL_DETAIL = os.path.join(BASE_DIR, "backend_auto/test_backend_data/hospitals_data", "detail.yaml")
+
 
 if __name__ == '__main__':
     print("==========",HOSTYAML_CONFIG)

readme.md

@@ -6,7 +6,9 @@
 - 公共分支 common_dev
 - 其他分支 参与项目的人每人创建一个已自己名字命名的分支，格式 dyy_dev
 
-### 提交代码规范
+### 提交代码及编写规范
+- ！！！切记一，在本地写代码时，一定要再三确认是在自己的分支进行改动，不要在master分支修改
+- ！！！切记二：提交代码，Git add时，不要添加in_common文件里面的文件，这个是公共方法，不能随意改动，如果本地误改动了，提交后，会影响整个流程
 - 为了便于项目的管理维护，参与者可以将自己的代码确保运行成功的前提下，提交到自己分支，然后每周往commo_dev
 分支提交代码，负责人会将common_dev分支每周往master分支合并，参与者可每周一更新本地代码，确保自己的代码是最新的
 - 本地代码提交Git仓库时，避免已经上传的代码被覆盖，请Git push之前，先操作git pull，在本地解决好冲突后，再Git push
@@ -47,15 +49,21 @@
 ```
 ![](.readme_images/request请求方法.png)
 
-- 然后在account_request.yaml中写请求数据，结构如图
+- 并且需要在该类中，读取path_setting路径中，配置的接口的yaml数据文件
+
+![](.readme_images/接口yaml数据读取.png)
+
+- 然后在account_request.yaml中写接口请求数据(接口路径，传参)，结构如图
 
 ![](.readme_images/yaml文件.png)
 
+
 - 然后写test_data，在test_backend_data目录下，找到account_data文件，创建yaml文件，yaml文件格式介绍，如图
 
 ![](.readme_images/yaml.png)
 
-- 将用例的路径放到path_setting.py下
+- 将用例的路径放到path_setting.py下，这里面有2个路径需要放到里面，第一个是all_backend_api下创建的XXX_request.yaml文件
+第二个是test_backend_case下创建的XXX.yaml文件
 
 ![](.readme_images/路径.png)
 

test_backend_case/conftest.py

+import pytest
+
+import path_setting
+
+
+@pytest.fixture()
+def login():
+    self.data = self.api_load(path_setting.APYAML_CONFIG)
+
+

test_backend_case/hospitals_case/test_detail.py

+import pytest
+
+from all_backend_api.hospitals_request import hospitals_request
+from ids_list import get_ids
+import path_setting
+from in_common.base_request import BaseRequest
+
+
+class TestDetail:
+    data = BaseRequest().api_load(path_setting.HOSPITAL_DETAIL)
+    detail_case, detail_data = get_ids(data, "detail")
+
+    @pytest.mark.parametrize("param", detail_data, ids=detail_case)
+    def test_detail(self, param):
+        r = hospitals_request().detail()
+
+        assert r["error"] == param["assert_error"]
+        assert r["data"]["base_info"]["hospital_name"] == param["assert"]
+        assert r["data"]["base_info"]["good_at"][0] == param["assert1"]
+        assert r["data"]["base_info"]["hospital_type"] == param["assert2"]
+        assert r["data"]["buy_related"]["gifts"][0]["gift_id"] == param["assert3"]
+        assert r["data"]["tab"] == param["assert4"]
+        assert r["data"]["image_header_area"]["hospital_images"][0] == param["assert5"]
+
+
+
+
+

test_backend_data/hospitals_data/detail.yaml

+detail:
+#校验成功case
+  -
+    case: "校验接口调用成功case"
+    assert_error: 0
+    assert: "北京嘉禾医疗美容"
+    assert1: "私密修复"
+    assert2: "民营"
+    assert3: 56895
+    assert4: {index: true, service: true, doctor: true, publish: false, doctor_say: false, diary: true, answer: false}
+    assert5: "https://heras.igengmei.com/doctor/2020/07/29/ef19b5fa94-w"
+  -
+    case: "校验医院名称case"
+    assert_error: 0
+    assert: "北京嘉禾医疗美容"
+    assert1: "私密修复"
+    assert2: "民营"
+    assert3: 56895
+    assert4: {index: true, service: true, doctor: true, publish: false, doctor_say: false, diary: true, answer: false}
+    assert5: "https://heras.igengmei.com/doctor/2020/07/29/ef19b5fa94-w"
+  -
+    case: "校验明星项目case"
+    assert_error: 0
+    assert: "北京嘉禾医疗美容"
+    assert1: "私密修复"
+    assert2: "民营"
+    assert3: 56895
+    assert4: {index: true, service: true, doctor: true, publish: false, doctor_say: false, diary: true, answer: false}
+    assert5: "https://heras.igengmei.com/doctor/2020/07/29/ef19b5fa94-w"
+  -
+    case: "校验医院类型case"
+    assert_error: 0
+    assert: "北京嘉禾医疗美容"
+    assert1: "私密修复"
+    assert2: "民营"
+    assert3: 56895
+    assert4: {index: true, service: true, doctor: true, publish: false, doctor_say: false, diary: true, answer: false}
+    assert5: "https://heras.igengmei.com/doctor/2020/07/29/ef19b5fa94-w"
+  -
+    case: "校验优惠券返回case"
+    assert_error: 0
+    assert: "北京嘉禾医疗美容"
+    assert1: "私密修复"
+    assert2: "民营"
+    assert3: 56895
+    assert4: {index: true, service: true, doctor: true, publish: false, doctor_say: false, diary: true, answer: false}
+    assert5: "https://heras.igengmei.com/doctor/2020/07/29/ef19b5fa94-w"
+  -
+    case: "校验tab返回case"
+    assert_error: 0
+    assert: "北京嘉禾医疗美容"
+    assert1: "私密修复"
+    assert2: "民营"
+    assert3: 56895
+    assert4: {index: true, service: true, doctor: true, publish: false, doctor_say: false, diary: true, answer: false}
+    assert5: "https://heras.igengmei.com/doctor/2020/07/29/ef19b5fa94-w"
+  -
+    case: "校验医院图片case"
+    assert_error: 0
+    assert: "北京嘉禾医疗美容"
+    assert1: "私密修复"
+    assert2: "民营"
+    assert3: 56895
+    assert4: {index: true, service: true, doctor: true, publish: false, doctor_say: false, diary: true, answer: false}
+    assert5: "https://heras.igengmei.com/doctor/2020/07/29/ef19b5fa94-w"
+

test_doctor_case/web2_case/test_service_list.py

+import pytest
+
+import path_setting
+from all_doctor_api.web2_request import web2_request
+from ids_list import get_ids
+from in_common.base_request import BaseRequest
+
+
+class TestServiceList:
+    data = BaseRequest().api_load(path_setting.SERVICE_DATA)
+    ServiceList_case, ServiceList_data = get_ids(data, "service_list")
+
+    @pytest.mark.parametrize("params",ServiceList_data,ids=ServiceList_case)
+    def test_ServiceList(self,params):
+
+        r = web2_request().service_list(params['page'],params['pagesize'],params['is_online'])
+        if r["error"] == 0:
+            assert r["data"]["page"] == params["assert"]
+        elif r["error"] == 1:
+            assert r["message"] == params["assert"]
+       # else:
+          #  assert r['error'] == 0
\ No newline at end of file

test_doctor_data/web2_data/service_list.yaml

+service_list:
+#有数据返回
+  -
+    case:  "数据"
+    page: "1"
+    pagesize: "10"
+    is_online: "-1"
+    assert: "1"