Merge branch 'common_dev' into zhanghui_dev

解决医院主页商品列表商品下线问题

all_backend_api/answer_request.yaml

@@ -4,7 +4,6 @@ detail:
   url: /api/answer/detail
   params:
     current_city_id: ${current_city_id}
-  data:
     answer_id: ${answer_id}
   json: {}
   # isLogin: 1  #需要登录添加这个字段，值为1  0是不需要登录的情况，如不需要登录，可以不添加这个字段

all_backend_api/janus_live_request.py

+import path_setting
+from in_common.base_request import BaseRequest
+
+
+class live_request(BaseRequest):
+    def __init__(self):
+        self.data = self.api_load(path_setting.LIVESERVICES_CONFIG)
+        self.data = self.api_load(path_setting.LIVEGIFTS_CONFIG)
+        self.data = self.api_load(path_setting.SEARCHSERVICE_CONFIG)
+        self.data = self.api_load(path_setting.ADDLIVESERVICE_CONFIG)
+        self.data = self.api_load(path_setting.DELETELIVESERVICE_CONFIG)
+        self.data = self.api_load(path_setting.DELETEGIFT_CONFIG)
+
+    #主播-推荐袋美购列表展示
+    def live_services(self, channel_id, stream_id, offset, size):
+        self.params["channel_id"] = channel_id
+        self.params["stream_id"] = stream_id
+        self.params["offset"] = offset
+        self.params["size"] = size
+        return self.api_send(self.data["live_services"])
+
+    #主播-推荐袋美券列表展示
+    def live_gifts(self, channel_id, gift_type, stream_id, offset, size):
+        self.params["channel_id"] = channel_id
+        self.params["gift_type"] = gift_type
+        self.params["stream_id"] = stream_id
+        self.params["offset"] = offset
+        self.params["size"] = size
+        return self.api_send(self.data["live_gifts"])
+
+    #主播-推荐袋商品捜索功能
+    def search_service(self, current_city_id, channel_id, query,  offset, size, version, device_id='97B6764B-2135-4761-9911-701C38CBC272'):
+        self.params["current_city_id"] = current_city_id
+        self.params["channel_id"] = channel_id
+        self.params["query"] = query
+        self.params["offset"] = offset
+        self.params["size"] = size
+        self.params["version"] = version
+        return self.api_send(self.data["search_service"])
+
+    #主播-推荐袋美券捜索功能
+    def search_gifts(self, current_city_id, channel_id, gift_type,  offset, size, version, device_id='97B6764B-2135-4761-9911-701C38CBC272'):
+        self.params["current_city_id"] = current_city_id
+        self.params["channel_id"] = channel_id
+        self.params["gift_type"] = gift_type
+        self.params["offset"] = offset
+        self.params["size"] = size
+        self.params["version"] = version
+        return self.api_send(self.data["search_gifts"])
+
+
+
+    #主播-推荐袋添加商品
+    def add_live_service(self, channel_id, service_item_ids, version,  device_id='97B6764B-2135-4761-9911-701C38CBC272'):
+        self.params["channel_id"] = channel_id
+        self.params["service_item_ids"] = service_item_ids
+        self.params["version"] = version
+        return self.api_send(self.data["add_live_service"])
+
+    #主播-推荐袋删除商品
+    def delete_live_service(self, channel_id, live_service_id, version,  device_id='97B6764B-2135-4761-9911-701C38CBC272'):
+        self.params["channel_id"] = channel_id
+        self.params["live_service_id"] = live_service_id
+        self.params["version"] = version
+        return self.api_send(self.data["delete_live_service"])
+
+    #主播-推荐袋删除美券
+    def delete_live_gift(self, channel_id, gift_id, gift_type, stream_id, version,  device_id='97B6764B-2135-4761-9911-701C38CBC272'):
+        self.params["channel_id"] = channel_id
+        self.params["gift_id"] = gift_id
+        self.params["gift_type"] = gift_type
+        self.params["stream_id"] = stream_id
+        self.params["version"] = version
+        return self.api_send(self.data["delete_live_gift"])
+
+if __name__ == '__main__':
+    print(live_request().live_services("745", "4177", "0", "10"))
+    print(live_request().search_service("beijing", "745", "", "0", "20", "7.45.0"))
+    print(live_request().add_live_service("745", "560641", "7.45.0"))
+    print(live_request().delete_live_service("745", "7242", "7.45.0"))
\ No newline at end of file

all_backend_api/janus_live_request.yaml

+#主播-推荐袋美购列表展示
+live_services:
+  method: GET
+  url: /api/janus/live/live_services
+  params:
+    channel_id: ${channel_id}
+    stream_id: ${stream_id}
+    offset: ${offset}
+    size: ${size}
+  data: {}
+  json: {}
+  isLogin: 1
+
+#主播-推荐袋美券列表展示
+live_gifts:
+  method: GET
+  url: /api/janus/live/live_gifts
+  params:
+    channel_id: ${channel_id}
+    gift_type: ${gift_type}
+    stream_id: ${stream_id}
+    offset: ${offset}
+    size: ${size}
+  data: {}
+  json: {}
+  isLogin: 1
+
+#主播-推荐袋商品捜索功能
+search_service:
+  method: GET
+  url: /api/janus/live/search_service
+  params:
+    current_city_id: ${current_city_id}
+    channel_id: ${channel_id}
+    query: ${query}
+    offset: ${offset}
+    size: ${size}
+    version: ${version}
+  data: {}
+  json: {}
+  isLogin: 1
+
+#主播-推荐袋添加商品
+add_live_service:
+  method: POST
+  url: /api/janus/live/add_live_service
+  params:
+    version: ${version}
+  data:
+    channel_id: ${channel_id}
+    service_item_ids: ${service_item_ids}
+  json: {}
+  isLogin: 1
+
+#主播-推荐袋删除商品
+delete_live_service:
+  method: POST
+  url: /api/janus/live/delete_live_service
+  params:
+    version: ${version}
+  data:
+    channel_id: ${channel_id}
+    live_service_id: ${live_service_id}
+  json: {}
+  isLogin: 1
+
+#主播-推荐袋删除美券
+delete_live_gift:
+  method: POST
+  url: /api/janus/live/delete_live_gift
+  params:
+    version: ${version}
+  data:
+    channel_id: ${channel_id}
+    gift_id: ${gift_id}
+    gift_type: ${gift_type}
+    stream_id: ${stream_id}
+  json: {}
+  isLogin: 1
+
+

all_backend_api/janus_request.py

@@ -22,6 +22,9 @@ class janus_request(BaseRequest):
         #次卡商详页
         self.data = self.api_load(path_setting.BEAUTY_CARD_DETAIL_CONFIG)
 
+        #直播polling循环
+        self.data = self.api_load(path_setting.POLLING_CONFIG)
+
     #搜索结果页-综合/百科tab
     def content_v7(self, query, device_id, current_city_id, version, is_first, tab_type, offset):
         #搜索词
@@ -230,6 +233,13 @@ class janus_request(BaseRequest):
 
         return self.api_send(self.data["page_rules"])
 
+    #直播poling循环
+    def polling(self,stream_id,is_first):
+        self.params["stream_id"] = stream_id
+        self.params["is_first"] = is_first
+
+        return self.api_send(self.data["polling"])
+
 
 
 if __name__ == '__main__':
@@ -303,6 +313,7 @@ if __name__ == '__main__':
     # print(janus_request().beauty_card_refund_submit("102813852173916", 3, "个人身体原因", 0))
     print(janus_request().beauty_card_order_detail(102247770691611))
     # print(janus_request().product_my_list(0, 0))
+
     #直播-点击【设置封面】
     print("直播-点击【设置封面】")
     print(janus_request().page_rules("744.2", "beijing", "post_add_pic"))

all_backend_api/janus_request.yaml

@@ -312,3 +312,15 @@ feed_service:
   data: {}
   json: {}
   isLogin: 0
+
+
+  #直播polling循环
+polling:
+  method: get
+  url: /api/janus/live/polling
+  params:
+    stream_id: ${stream_id}
+    is_first: ${is_first}
+  data: {}
+  json: {}
+

all_backend_api/live_request.py

@@ -22,6 +22,7 @@ class living_request(BaseRequest):
         return self.api_send(self.data["pushlive_info"])
 
 
+
 if __name__ == '__main__':
     (living_request().danmu_v2("739", "1"))
     (living_request().pushlive_info("小冤家", "2021/04/22/1003/cef471cff5e6", "", "1", "1", "1"))
\ No newline at end of file

all_backend_api/live_request.yaml

@@ -24,3 +24,32 @@ pushlive_info:
   json: {}
   isLogin: 1
 
+#主播-推荐袋美购列表展示
+live_services:
+  method: GET
+  url: /api/janus/live/live_services
+  params:
+    channel_id: ${channel_id}
+    stream_id: ${stream_id}
+    offset: ${offset}
+    size: ${size}
+  data: {}
+  json: {}
+  isLogin: 1
+
+#主播-推荐袋商品捜索功能
+search_services:
+  method: GET
+  url: /api/janus/live/search_services
+  params:
+    current_city_id: ${current_city_id}
+    channel_id: ${channel_id}
+    query: ${query}
+    offset: ${offset}
+    size: ${size}
+    trace_id: ${trace_id}
+  data: {}
+  json: {}
+  isLogin: 1
+
+

all_backend_api/tractate_request.py

@@ -53,7 +53,6 @@ class tractate_request(BaseRequest):
         self.params["reply_id"] = reply_id
         return self.api_send(self.data["tractate_cancelvote"])
 
-
     # 帖子创建一级&二级评论
     def publish_reply(self, tractate_id, data_type, reply_id, content):
         self.params["tractate_id"] = tractate_id
@@ -62,5 +61,10 @@ class tractate_request(BaseRequest):
         self.params["content"] = content
         return self.api_send(self.data["publish_reply"])
 
+    # 帖子创建--登录下
+    def create(self):
+        return self.api_send(self.data["create"])
 
-
+    # 帖子创建--未登录下
+    def create_unlogin(self):
+        return self.api_send(self.data["create_unlogin"])

all_backend_api/tractate_request.yaml

@@ -100,4 +100,24 @@ publish_reply:
     content: ${content}
   json: {}
   isLogin: 1  #需要登录添加这个字段，值为1  0是不需要登录的情况，如不需要登录，可以不添加这个字段
+#
+
+#帖子创建一-未登录
+create_unlogin:
+  method: get
+  url: /api/tractate/create
+  params:
+  data:
+  json: {}
+  isLogin: 0  #需要登录添加这个字段，值为1  0是不需要登录的情况，如不需要登录，可以不添加这个字段
+#
+
+#帖子创建一-登录
+create:
+  method: get
+  url: /api/tractate/create
+  params:
+  data:
+  json: {}
+  isLogin: 1  #需要登录添加这个字段，值为1  0是不需要登录的情况，如不需要登录，可以不添加这个字段
 #
\ No newline at end of file

all_backend_api/user_request.py

@@ -12,8 +12,6 @@ class user_request(BaseRequest):
         return self.api_send(self.data["personal_center"])
 
 
-
-
     def __init__(self):
         self.data = self.api_load(path_setting.USER_ANSWER_CONFIG)
 
@@ -32,6 +30,20 @@ class user_request(BaseRequest):
     def topic_canclefavor(self):
         return self.api_send(self.data["canclefavor"])
 
+    #关注主播
+    def follow_add(self,uid,from_live):
+        self.params["uid"] = uid
+        self.params["from_live"] = from_live
+        return self.api_send(self.data['follow_add'])
+
+    #取消关注
+    def follow_del(self,uid,from_live):
+        self.params["uid"] = uid
+        self.params["from_live"] = from_live
+        return self.api_send(self.data["follow_del"])
+
+
+
 
     #我的-日记
     def my_diary_v2(self, start_num, count):
@@ -62,7 +74,7 @@ if __name__ == '__main__':
     # 日记贴收藏&取消收藏
     # print(user_request().topic_favor())
     # print(user_request().topic_canclefavor())
-
+    print(user_request().follow_del("33909625","4196"))
 
     #我的-日记
     print(user_request().my_diary_v2(0, 10))

all_backend_api/user_request.yaml

@@ -38,6 +38,30 @@ canclefavor:
   json: {}
   isLogin: 1
 
+<<<<<<< HEAD
+  #直播-关注主播
+follow_add:
+  method: post
+  url: /api/user/follow/add
+  params: {}
+  data:
+    uid: ${uid}
+    from_live: ${from_live}
+  json: {}
+  isLogin: 1
+
+  #直播-取消关注
+follow_del:
+  method: post
+  url: /api/user/follow/del
+  params: {}
+  data:
+    uid: ${uid}
+    from_live: ${from_live}
+  json: {}
+  isLogin: 1
+
+=======
 # 我的-日记
 my_diary_v2:
   method: GET
@@ -59,4 +83,5 @@ user_tractate:
     count: ${count}
   data: {}
   json: {}
-  isLogin: 1
\ No newline at end of file
+  isLogin: 1
+

host.yaml

@@ -3,3 +3,4 @@ develop_host:
   om: http://om.paas-develop.env
   doctor: http://doctor.paas-develop.env
 #  backend_online: https://backend.igengmei.com
+

path_setting.py

@@ -85,6 +85,8 @@ TRACTATE_FAVOR = os.path.join(BASE_DIR, "backend_auto/test_backend_data/tractate
 TRACTATE_VOTE = os.path.join(BASE_DIR, "backend_auto/test_backend_data/tractate_data", "vote.yaml")
 # 帖子详情页--一级评论创建
 TRACTATE_PUBLISH_REPLY = os.path.join(BASE_DIR, "backend_auto/test_backend_data/tractate_data", "publish_reply.yaml")
+#发帖子--帖子内容创建
+TRACTATE_CREATE = os.path.join(BASE_DIR, "backend_auto/test_backend_data/tractate_data", "create.yaml")
 
 
 # 问答详情页--问题详情
@@ -97,8 +99,6 @@ ANSWER_LIST = os.path.join(BASE_DIR, "backend_auto/test_backend_data/hybrid_data
 QA_CONFIG = os.path.join(BASE_DIR, "backend_auto/all_backend_api", "qa_request.yaml")
 # -问题的收藏&取消收藏
 QA_FAVOR = os.path.join(BASE_DIR, "backend_auto/test_backend_data/qa_data", "favor.yaml")
-# -test的文件，尝试在不动原函数的基础上加参数而不是用默认参数。--没必要
-# TEST_QA = os.path.join(BASE_DIR, "backend_auto/test_backend_data/qa_data", "test.yaml")
 
 
 # 回答评论点赞&取消点赞
@@ -528,6 +528,44 @@ FREE_RECRUIT_LIST = os.path.join(BASE_DIR, "backend_auto/test_backend_data/feed_
 PAGE_RULES_CONFIG = os.path.join(BASE_DIR, "backend_auto/all_backend_api", "janus_request.yaml")
 PAGE_RULES = os.path.join(BASE_DIR, "backend_auto/test_backend_data/janus_data", "page_rules.yaml")
 
+
+#直播polling循环
+POLLING_CONFIG = os.path.join(BASE_DIR, "backend_auto/all_backend_api", "janus_request.yaml")
+POLLING = os.path.join(BASE_DIR, "backend_auto/test_backend_data/janus_data", "polling.yaml")
+
+#直播关注/取关主播
+FOLLOW_ADD = os.path.join(BASE_DIR, "backend_auto/test_backend_data/user_data", "follow_add.yaml")
+FOLLOW_DEL = os.path.join(BASE_DIR, "backend_auto/test_backend_data/user_data", "follow_del.yaml")
+
+
+#主播-推荐袋美购列表展示
+LIVESERVICES_CONFIG = os.path.join(BASE_DIR, "backend_auto/all_backend_api", "janus_live_request.yaml")
+LIVESERVICES = os.path.join(BASE_DIR, "backend_auto/test_backend_data/janus_live_data", "live_services.yaml")
+
+#主播-推荐袋美券列表展示
+LIVEGIFTS_CONFIG = os.path.join(BASE_DIR, "backend_auto/all_backend_api", "janus_live_request.yaml")
+LIVEGIFTS = os.path.join(BASE_DIR, "backend_auto/test_backend_data/janus_live_data", "live_gifts.yaml")
+
+#主播-推荐袋商品搜索功能
+SEARCHSERVICE_CONFIG = os.path.join(BASE_DIR, "backend_auto/all_backend_api", "janus_live_request.yaml")
+SEARCHSERVICE = os.path.join(BASE_DIR, "backend_auto/test_backend_data/janus_live_data", "search_service.yaml")
+
+#主播-推荐袋美券搜索功能
+SEARCHGIFTS_CONFIG = os.path.join(BASE_DIR, "backend_auto/all_backend_api", "janus_live_request.yaml")
+SEARCHGIFTS = os.path.join(BASE_DIR, "backend_auto/test_backend_data/janus_live_data", "search_gifts.yaml")
+
+#主播-推荐袋添加商品
+ADDLIVESERVICE_CONFIG = os.path.join(BASE_DIR, "backend_auto/all_backend_api", "janus_live_request.yaml")
+ADDLIVESERVICE = os.path.join(BASE_DIR, "backend_auto/test_backend_data/janus_live_data", "add_live_service.yaml")
+
+#主播-推荐袋删除商品
+DELETELIVESERVICE_CONFIG = os.path.join(BASE_DIR, "backend_auto/all_backend_api", "janus_live_request.yaml")
+DELETELIVESERVICE = os.path.join(BASE_DIR, "backend_auto/test_backend_data/janus_live_data", "delete_live_service.yaml")
+
+#主播-推荐袋删除美券
+DELETEGIFT_CONFIG = os.path.join(BASE_DIR, "backend_auto/all_backend_api", "janus_live_request.yaml")
+DELETEGIFT = os.path.join(BASE_DIR, "backend_auto/test_backend_data/janus_live_data", "delete_live_gift.yaml")
+
 #免费招募活动详情
 FREE_RECRUIT_DETAIL_CONFIG = os.path.join(BASE_DIR, "backend_auto/all_backend_api", "feed_request.yaml")
 FREE_RECRUIT_DETAIL = os.path.join(BASE_DIR, "backend_auto/test_backend_data/feed_data", "free_recruit_detail.yaml")
@@ -548,5 +586,6 @@ MY_DIARY_V2 = os.path.join(BASE_DIR, "backend_auto/test_backend_data/user_data",
 USER_TRACTATE_CONFIG = os.path.join(BASE_DIR, "backend_auto/all_backend_api", "user_request.yaml")
 USER_TRACTATE = os.path.join(BASE_DIR, "backend_auto/test_backend_data/user_data", "user_tractate.yaml")
 
+
 if __name__ == '__main__':
     print("==========",LIVEYAML_CONFIG)

test_backend_case/answer_case/test_detail.py

@@ -3,20 +3,30 @@ import pytest
 from ids_list import get_ids
 import path_setting
 from in_common.base_request import BaseRequest
-from all_backend_api.account_request import account_request
+from all_backend_api.answer_request import answer_request
 
 
-class TestLoginVfc:
-    data = BaseRequest().api_load(path_setting.LOGIN_VFC)
-    loginvfc_case, loginvfc_data = get_ids(data, "login_vfc")
+class TestDetail:
+    data = BaseRequest().api_load(path_setting.DETAIL)
+    detail_case, detail_data = get_ids(data, "detail")
+
+    @pytest.mark.parametrize("param",detail_data,ids=detail_case)
+    def test_detail(self,param):
+        # print(param["vfc_code"])
+        r = answer_request().detail(param["current_city_id"], param["answer_id"])
+        # if r["error"] == 0:
+        #     assert r["data"]["account_phone"] == param["assert"]
+        # if r["error"] == 1:
+        #     assert r["message"] == param["assert"]
+        assert r["data"]["is_favored"] is not None and r["data"]["is_favored"] is not ""
+        assert r["data"]["comment_num"] is not None and r["data"]["comment_num"] is not ""
+        assert r["data"]["time"] is not None and r["data"]["time"] is not ""
+        assert r["data"]["vote_num"] is not None and r["data"]["vote_num"] is not ""
+        assert r["data"]["is_following"] is not None and r["data"]["is_following"] is not ""
+        assert r["data"]["is_author"] is not None and r["data"]["is_author"] is not ""
+        assert r["data"]["is_voted"] is not None and r["data"]["is_voted"] is not ""
+        assert r["data"]["view_num"] is not None and r["data"]["view_num"] is not ""
+        assert r["data"]["answer_id"] is not None and r["data"]["answer_id"] is not ""
 
-    @pytest.mark.parametrize("param",loginvfc_data,ids=loginvfc_case)
-    def test_login_vfc(self,param):
-        print(param["vfc_code"])
-        r = account_request().login_vfc(param["current_city_id"], param["phone_num"], param["vfc_code"])
-        if r["error"] == 0:
-            assert r["data"]["account_phone"] == param["assert"]
-        if r["error"] == 1:
-            assert r["message"] == param["assert"]
 
 

test_backend_case/hybrid_case/test_answer_answer_reply_vote.py

@@ -8,14 +8,13 @@ from all_backend_api.hybrid_request import hybrid_request
 
 class TestAnswerAnswerReplyVote:
     data = BaseRequest().api_load(path_setting.QA_REPLY_VOTE)
-    test_case, test_data = get_ids(data, "answer_reply_vote")
+    answeranswerreplyvote_case, answeranswerreplyvote_data = get_ids(data, "answer_reply_vote")
 
-    @pytest.mark.parametrize("param", test_data, ids=test_case)
+    @pytest.mark.parametrize("param", answeranswerreplyvote_data, ids=answeranswerreplyvote_case)
     def test_answer_answer_reply_vote(self, param):
         # 直接点赞，看是否能点赞，如果返回1，就直接进入取消点赞
         vote = hybrid_request().answer_reply_vote(param["id"])
         if vote["error"] == 0:
-            print(1)
             # 校验二次点赞无效
             vote = hybrid_request().answer_reply_vote(param["id"])
             assert vote["message"] == param["assert3"]
@@ -23,14 +22,12 @@ class TestAnswerAnswerReplyVote:
             # 取消点赞，回到取消点赞的状态
             cancelvote = hybrid_request().answer_reply_cancel_vote(param["id"])
             assert cancelvote["error"] == 0
-            print(2)
         else:
             assert vote["error"] == 1
             assert vote["message"] == param["assert3"]
             # 取消点赞，回到取消点赞的状态
             cancelvote = hybrid_request().answer_reply_cancel_vote(param["id"])
             assert cancelvote["error"] == 0
-            print(2)
 
 
 

test_backend_case/hybrid_case/test_question_new_answer_list.py

@@ -7,11 +7,11 @@ from all_backend_api.hybrid_request import hybrid_request
 
 
 
-class TestQuestionNewAnswerLiist:
+class TestQuestionNewAnswerList:
     data = BaseRequest().api_load(path_setting.ANSWER_LIST)
-    test_case, test_data = get_ids(data, "question_new_answer_list")
+    questionnewanswerlist_case, questionnewanswerlist_data = get_ids(data, "question_new_answer_list")
 
-    @pytest.mark.parametrize("param", test_data, ids=test_case)
+    @pytest.mark.parametrize("param", questionnewanswerlist_data, ids=questionnewanswerlist_case)
     def test_question_v1(self, param):
         r = hybrid_request().question_new_answer_list(param["question_id"])
         if r["error"] == 0:

test_backend_case/hybrid_case/test_question_v1.py

@@ -9,9 +9,9 @@ from all_backend_api.hybrid_request import hybrid_request
 
 class TestQuestionV1:
     data = BaseRequest().api_load(path_setting.QUESTION_DETAIL)
-    test_case, test_data = get_ids(data, "question_v1")
+    questionv1_case, questionv1_data = get_ids(data, "question_v1")
 
-    @pytest.mark.parametrize("param", test_data, ids=test_case)
+    @pytest.mark.parametrize("param", questionv1_data, ids=questionv1_case)
     def test_question_v1(self, param):
         r = hybrid_request().question_v1()
         assert r["error"] == param["error"]

test_backend_case/janus_case/test_polling.py

+import pytest
+from ids_list import get_ids
+import path_setting
+from in_common.base_request import BaseRequest
+from all_backend_api.janus_request import janus_request
+
+
+class TestPolling:
+    data = BaseRequest().api_load(path_setting.POLLING)
+    polling_case, polling_data = get_ids(data, "polling")
+    print('polling_data:',polling_data)
+    @pytest.mark.parametrize("param",polling_data,ids=polling_case)
+    def test_polling(self,param):
+        print(param)
+        r = janus_request().polling(param["stream_id"],param["is_first"])
+        print(r)
+        if r["error"] == 0:
+            assert r["data"]["delay"] == param["assert"]
\ No newline at end of file

test_backend_case/janus_case/test_product_mall_service_home_feed.py

@@ -8,9 +8,9 @@ from all_backend_api.janus_request import janus_request
 
 class TestProductMallServiceHomeFeed:
     data = BaseRequest().api_load(path_setting.FEED_TAB_SERVICE)
-    test_case, test_data = get_ids(data, "feed_service")
+    productmallservicehomefeed_case, productmallservicehomefeed_data = get_ids(data, "feed_service")
 
-    @pytest.mark.parametrize("param", test_data, ids=test_case)
+    @pytest.mark.parametrize("param", productmallservicehomefeed_data, ids=productmallservicehomefeed_case)
     def test_product_mall_service_home_feed(self,param):
         r = janus_request().feed_service(param["tab_value"], param["first_load"])
         assert r["error"] == 0

test_backend_case/janus_live_case/test_add_live_service.py

+import pytest
+
+import path_setting
+from all_backend_api.janus_live_request import live_request
+from ids_list import get_ids
+from in_common.base_request import BaseRequest
+
+
+class TestAddLiveService:
+    data = BaseRequest().api_load(path_setting.ADDLIVESERVICE)
+    addliveservice_case, addliveservice_data = get_ids(data, "add_live_service")
+
+    @pytest.mark.parametrize("param", addliveservice_data, ids=addliveservice_case)
+    def test_add_live_service(self, param):
+        print(111111111111111111111)
+        r = live_request().add_live_service(param["channel_id"], param["service_item_ids"], param["version"])
+        if r["error"] == 0:
+            assert r["data"]["toast"] == param["assert"]
\ No newline at end of file

test_backend_case/janus_live_case/test_delete_live_gift.py

+import pytest
+
+import path_setting
+from all_backend_api.janus_live_request import live_request
+from ids_list import get_ids
+from in_common.base_request import BaseRequest
+
+
+class TestDeleteLiveGift:
+    data = BaseRequest().api_load(path_setting.DELETEGIFT)
+    deletelivegift_case, deletelivegift_data = get_ids(data, "delete_live_gift")
+
+    @pytest.mark.parametrize("param", deletelivegift_data, ids=deletelivegift_case)
+    def test_delete_live_gift(self, param):
+        print(111111111111111111111)
+        r = live_request().delete_live_gift(param["channel_id"], param["gift_id"], param["stream_id"], param["gift_type"], param["version"])
+        if r["error"] == 0:
+            assert r["data"]["toast"] == param["assert"]
\ No newline at end of file

test_backend_case/janus_live_case/test_delete_live_service.py

+import pytest
+
+import path_setting
+from all_backend_api.janus_live_request import live_request
+from ids_list import get_ids
+from in_common.base_request import BaseRequest
+
+
+class TestDeleteLiveService:
+    data = BaseRequest().api_load(path_setting.DELETELIVESERVICE)
+    deleteliveservice_case, deleteliveservice_data = get_ids(data, "delete_live_service")
+
+    @pytest.mark.parametrize("param", deleteliveservice_data, ids=deleteliveservice_case)
+    def test_delete_live_service(self, param):
+        print(111111111111111111111)
+        r = live_request().delete_live_service(param["channel_id"], param["live_service_id"], param["version"])
+        if r["error"] == 0:
+            assert r["data"]["toast"] == param["assert"]
\ No newline at end of file

test_backend_case/janus_live_case/test_live_gifts.py

+import pytest
+
+import path_setting
+from all_backend_api.janus_live_request import live_request
+from ids_list import get_ids
+from in_common.base_request import BaseRequest
+
+
+class TestLiveGifts:
+    data = BaseRequest().api_load(path_setting.LIVEGIFTS)
+    livegifts_case, livegifts_data = get_ids(data, "live_gifts")
+
+    @pytest.mark.parametrize("param", livegifts_data, ids=livegifts_case)
+    def test_live_gifts(self, param):
+        print(111111111111111111111)
+        r = live_request().live_gifts(param["channel_id"], param["gift_type"], param["stream_id"], param["offset"], param["size"])
+        if r["error"] == 0:
+            assert r["data"]["offset"] == param["assert"]
\ No newline at end of file

test_backend_case/janus_live_case/test_live_services.py

+import pytest
+
+import path_setting
+from all_backend_api.janus_live_request import live_request
+from ids_list import get_ids
+from in_common.base_request import BaseRequest
+
+
+class TestLiveServices:
+    data = BaseRequest().api_load(path_setting.LIVESERVICES)
+    liveservices_case, liveservices_data = get_ids(data, "live_services")
+
+    @pytest.mark.parametrize("param", liveservices_data, ids=liveservices_case)
+    def test_live_services(self, param):
+        print(111111111111111111111)
+        r = live_request().live_services(param["channel_id"], param["stream_id"], param["offset"], param["size"])
+        if r["error"] == 0:
+            assert r["data"]["offset"] == param["assert"]
\ No newline at end of file

test_backend_case/janus_live_case/test_search_service.py

+import pytest
+
+import path_setting
+from all_backend_api.janus_live_request import live_request
+from ids_list import get_ids
+from in_common.base_request import BaseRequest
+
+
+class TestSearchService:
+    data = BaseRequest().api_load(path_setting.SEARCHSERVICE)
+    searchservice_case,  searchservice_data = get_ids(data, "search_service")
+
+    @pytest.mark.parametrize("param", searchservice_data, ids=searchservice_case)
+    def test_search_service(self, param):
+        print(111111111111111111111)
+        r = live_request().search_service(param["current_city_id"], param["channel_id"], param["query"], param["offset"], param["size"], param["version"])
+        if r["error"] == 0:
+            assert r["data"]["services"] != param["assert"]
\ No newline at end of file

test_backend_case/oneimage_case/test_share_v4.py

@@ -18,5 +18,16 @@ class TestShareV4:
     def test_share_v4(self,param):
         r = oneimage_request().share_v4(param["version"], param["face_id"])
         assert r["error"] == 0
+        face_name = r["data"]["face_desc"]["face_name"]
+        assert face_name is not None
 
-
+        classification_info = r["data"]["classification_info"]
+        # 测颜值结果,保证五官有值
+        for key,value in classification_info.items():
+            print(key, value["name"], value["param"])
+            assert value["name"] is not None
+            assert value["param"] is not None
+        # 颜值报告
+        content = r["data"]["tractate_info"]["content"]
+        print(content)
+        assert content is not None

test_backend_case/qa_case/test_favor.py

@@ -8,9 +8,9 @@ from all_backend_api.qa_request import qa_request
 
 class TestFavor:
     data = BaseRequest().api_load(path_setting.QA_FAVOR)
-    test_case, test_data = get_ids(data, "favor")
+    favor_case, favor_data = get_ids(data, "favor")
 
-    @pytest.mark.parametrize("param", test_data, ids=test_case)
+    @pytest.mark.parametrize("param", favor_data, ids=favor_case)
     def test_favor(self, param):
         r = qa_request().favor(param["answer_id"])
         assert r["error"] == param["error"]

test_backend_case/service_case/test_home_feed.py

@@ -8,9 +8,9 @@ from all_backend_api.service_request import service_request
 
 class TestProductMallServiceHomeFeed:
     data = BaseRequest().api_load(path_setting.FEED_TAB_SERVICE_DOCTORS)
-    test_case, test_data = get_ids(data, "home_feed")
+    productmallservicehomefeed_case, productmallservicehomefeed_data = get_ids(data, "home_feed")
 
-    @pytest.mark.parametrize("param", test_data, ids=test_case)
+    @pytest.mark.parametrize("param", productmallservicehomefeed_data, ids=productmallservicehomefeed_case)
     def test_product_mall_service_home_feed(self,param):
         r = service_request().feed_home(param["tab_value"], param["input_type"])
         assert r["error"] == 0

test_backend_case/tractate_case/test_create.py

+import json
+
+import pytest
+
+from ids_list import get_ids
+import path_setting
+from in_common.base_request import BaseRequest
+from all_backend_api.tractate_request import tractate_request
+
+
+class TestCreate:
+    data = BaseRequest().api_load(path_setting.TRACTATE_CREATE)
+    create_case, create_data = get_ids(data, "create")
+
+    @pytest.mark.parametrize("param", create_data, ids=create_case)
+    def test_create(self, param):
+        # 登录了的-校验
+        r = tractate_request().create()
+        assert r["error"] == param["error1"]
+        # 未登录的-校验
+        s = tractate_request().create_unlogin()
+        s = json.loads(s)
+        # r = json.loads(r)
+        # print(type(r))
+        assert s["message"] == param["message1"]
+
+
+
+
+
+
+
+

test_backend_case/tractate_case/test_favor.py

@@ -8,9 +8,9 @@ from all_backend_api.tractate_request import tractate_request
 
 class TestFavor:
     data = BaseRequest().api_load(path_setting.TRACTATE_FAVOR)
-    test_case, test_data = get_ids(data, "favor")
+    favor_case, favor_data = get_ids(data, "favor")
 
-    @pytest.mark.parametrize("param", test_data, ids=test_case)
+    @pytest.mark.parametrize("param", favor_data, ids=favor_case)
     def test_favor(self, param):
         r = tractate_request().favor(param["tractate_id"], param["data_type"])
         # print(r)

test_backend_case/tractate_case/test_publish_reply.py

@@ -8,9 +8,9 @@ from all_backend_api.tractate_request import tractate_request
 
 class TestPublishReply:
     data = BaseRequest().api_load(path_setting.TRACTATE_PUBLISH_REPLY)
-    test_case, test_data = get_ids(data, "publish_reply")
+    publishreply_case, publishreply_data = get_ids(data, "publish_reply")
 
-    @pytest.mark.parametrize("param", test_data, ids=test_case)
+    @pytest.mark.parametrize("param", publishreply_data, ids=publishreply_case)
     def test_publish_reply(self, param):
         r = tractate_request().publish_reply(param["tractate_id"], param["data_type"], param["reply_id"], param["content"])
         # print(r)

test_backend_case/tractate_case/test_reply.py

@@ -7,9 +7,9 @@ from all_backend_api.tractate_request import tractate_request
 
 class TestReply:
     data = BaseRequest().api_load(path_setting.TRACTATE_REPLY)
-    test_case, test_data = get_ids(data, "reply")
+    reply_case, reply_data = get_ids(data, "reply")
 
-    @pytest.mark.parametrize("param", test_data, ids=test_case)
+    @pytest.mark.parametrize("param", reply_data, ids=reply_case)
     def test_reply(self, param):
         r = tractate_request().reply( param["current_city_id"], param["id"], param["data_type"] )
         # print(r)

test_backend_case/tractate_case/test_vote.py

@@ -9,9 +9,9 @@ from all_backend_api.tractate_request import tractate_request
 
 class TestVote:
     data = BaseRequest().api_load(path_setting.TRACTATE_VOTE)
-    test_case, test_data = get_ids(data, "tractate_vote")
+    vote_case, vote_data = get_ids(data, "tractate_vote")
 
-    @pytest.mark.parametrize("param", test_data, ids=test_case)
+    @pytest.mark.parametrize("param", vote_data, ids=vote_case)
     def test_vote(self, param):
         r = tractate_request().tractate_detail(param["current_city_id"], param["tractate_id"], param["data_type"])
         if r["error"] == 0:
@@ -22,12 +22,62 @@ class TestVote:
                 assert vote["error"] == 0
                 assert vote["message"] == param["message1"]
                 # 取消点赞，回到取消点赞的状态
-                canclevote = tractate_request().tractate_cancelvote(param["tractate_id"], param["data_type"], param["reply_id"])
-                assert canclevote["error"] == 0
+                cancelvote = tractate_request().tractate_cancelvote(param["tractate_id"], param["data_type"], param["reply_id"])
+                assert cancelvote["error"] == 0
             else:
                 # 如果是已经点过赞的状态就直接取消点赞
-                canclevote = tractate_request().tractate_cancelvote(param["tractate_id"], param["data_type"], param["reply_id"])
-                assert canclevote["message"] == param["message2"]
+                cancelvote = tractate_request().tractate_cancelvote(param["tractate_id"], param["data_type"], param["reply_id"])
+                assert cancelvote["message"] == param["message2"]
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+        # r = tractate_request().tractate_detail(param["current_city_id"], param["tractate_id"], param["data_type"])
+        # if r["error"] == 0:
+        #     assert r["error"] == param["assert1"]
+        #     # 如果没有点过赞，就先校验点赞之后再取消点赞。【最后保持取消点赞的状态】
+        #     if not r["data"]["tractate_list"]["is_voted"]:
+        #         vote = tractate_request().tractate_vote(param["tractate_id"], param["data_type"], param["reply_id"])
+        #         assert vote["error"] == 0
+        #         assert vote["message"] == param["message"]
+        #         print(param["position"])
+        #     #     # 取消点赞，回到取消点赞的状态
+        #     #     cancelvote = tractate_request().tractate_cancelvote(param["tractate_id"], param["data_type"], param["reply_id"])
+        #     #     assert cancelvote["error"] == 0
+        #     elif param["position"] == 1:
+        #         vote = tractate_request().tractate_vote(param["tractate_id"], param["data_type"], param["reply_id"])
+        #         assert vote["error"] == 0
+        #         assert vote["message"] == param["message"]
+        #         print(param["position"])
+        #     else:
+        #         # 如果是已经点过赞的状态就直接取消点赞
+        #         cancelvote = tractate_request().tractate_cancelvote(param["tractate_id"], param["data_type"], param["reply_id"])
+        #         assert cancelvote["message"] == param["message"]
+        #         print(param["position"])
 
 
 

test_backend_case/user_case/test_follow_add.py

+import pytest
+
+from ids_list import get_ids
+import path_setting
+from in_common.base_request import BaseRequest
+from all_backend_api.user_request import user_request
+import  json
+
+class TestFollowAdd:
+    data = BaseRequest().api_load(path_setting.FOLLOW_ADD)
+    follow_add_case, follow_add_data = get_ids(data, "follow_add")
+
+    @pytest.mark.parametrize("param",follow_add_data, ids=follow_add_case)
+    def test_follow_add(self, param):
+        r = user_request().follow_add(param["uid"], param["from_live"])
+#        r=json.loads(r)
+#        print("---------",r,type(r))
+        if r["error"] == 0:
+            assert r["error"] == param["assert"]
+        if r["error"] == 1:
+            assert r["message"] == param["assert1"]
\ No newline at end of file

test_backend_case/user_case/test_follow_del.py

+import pytest
+from ids_list import get_ids
+import path_setting
+from in_common.base_request import BaseRequest
+from all_backend_api.user_request import user_request
+
+
+class TestFollowDel:
+    data = BaseRequest().api_load(path_setting.FOLLOW_DEL)
+    follow_del_case, follow_del_data = get_ids(data,"follow_del")
+
+    @pytest.mark.parametrize("param", follow_del_data, ids=follow_del_case)
+    def test_follow_del(self,param):
+        r = user_request().follow_del(param["uid"], param["from_live"])
+        if r["error"] == 0:
+            assert r["error"] == param["assert"]
\ No newline at end of file

test_backend_data/hybrid_data/question_v1.yaml

@@ -3,6 +3,5 @@ question_v1:
   -
     case: "问题详情"
     error: 0
-
     assert: false
     assert2: true

test_backend_data/janus_data/polling.yaml

+#polling_vfc:
+polling:
+#循环成功
+  -
+    case: "polling循环成功"
+    stream_id: "2334"
+    is_first: "0"
+    assert: 10
\ No newline at end of file

test_backend_data/janus_live_data/add_live_service.yaml

+add_live_service:
+#主播-推荐袋添加商品-添加一个商品
+  -
+    case: "主播-推荐袋添加商品-添加一个商品"
+    channel_id: "747"
+    service_item_ids: "560641"
+    version: "7.45.0"
+    assert : 成功添加1件商品
+
+#主播-推荐袋添加商品-添加多个商品
+  -
+    case: "主播-推荐袋添加商品-添加多个商品"
+    channel_id: "747"
+    service_item_ids: "108278,578088,585823"
+    version: "7.45.0"
+    assert : 成功添加3件商品
\ No newline at end of file

test_backend_data/janus_live_data/delete_live_gift.yaml

+delete_live_gift:
+#主播-推荐袋删除美券-美券成功删除
+  -
+    case: "主播-推荐袋删除美券-美券成功删除"
+    channel_id: "745"
+    gift_id: "59088"
+    gift_type: "1"
+    stream_id: "4207"
+    version: "7.45.0"
+    assert : 美券已删除
\ No newline at end of file

test_backend_data/janus_live_data/delete_live_service.yaml

+delete_live_service:
+#主播-推荐袋删除商品-商品成功删除
+  -
+    case: "主播-推荐袋删除商品-商品成功删除"
+    channel_id: "745"
+    live_service_id: "7251"
+    version: "7.45.0"
+    assert : 商品已删除
\ No newline at end of file

test_backend_data/janus_live_data/live_gifts.yaml

+live_gifts:
+#主播-推荐袋美券列表正常展示
+  -
+    case: "主播-推荐袋美券列表正常展示"
+    channel_id: "745"
+    gift_type: "3"
+    stream_id: "4205"
+    offset: "0"
+    size: "20"
+    assert : 0

test_backend_data/janus_live_data/live_services.yaml

+live_services:
+#主播-推荐袋美购列表正常展示
+  -
+    case: "主播-推荐袋美购列表正常展示"
+    channel_id: "746"
+    stream_id: "4181"
+    offset: "0"
+    size: "20"
+    assert : 20

test_backend_data/janus_live_data/search_service.yaml

+search_service:
+#主播-推荐袋商品搜索功能
+  -
+    case: "主播-推荐袋商品搜索功能"
+    current_city_id: "beijing"
+    channel_id: "745"
+    query: ""
+    offset: "0"
+    size: "20"
+    version: "7.45.0"
+    assert : 0
+
+#主播-推荐袋商品搜索功能-捜索双眼皮
+  -
+    case: "主播-推荐袋商品搜索功能-捜索双眼皮"
+    current_city_id: "beijing"
+    channel_id: "745"
+    query: "双眼皮"
+    offset: "0"
+    size: "20"
+    version: "7.45.0"
+    assert : 0

test_backend_data/topic_data/topic_reply_create.yaml

@@ -3,7 +3,7 @@ reply_create:
   beuzhu: '# 备注： 这个文件有冲突的话，那个版本都行不会影响，回退/接受当前版本都行，因为每次运行content都会改变'
   case: 日记贴一级评论创建--正常校验&创建二级评论--正常校验
   channel: benzhan
-  content: ces测试+2021-06-29 15:08:14
+  content: ces测试+2021-07-09 19:39:05
   message: 请勿回复重复内容
   message1: 回复成功
   message2: 你的回复有点频繁，稍后再来

test_backend_data/tractate_data/create.yaml

+create:
+  #发帖子--创建帖子页面接口校验
+  -
+    case: "发帖子--创建帖子页面接口校验-"
+    current_city_id: "beijiing"
+    error1: 0
+    message1:  "请登录后再试"
+
+
+
+
+

test_backend_data/tractate_data/vote.yaml

 tractate_vote:
-  #贴子详情页点赞
+  #贴子详情页点赞----简单粗暴直接全部用写死的数据【不同帖子代表不同类型--并且把取消点赞接口迁移出去--指定输入-指定输出】
+  #position代表要用的是什么类型的case---不是必须有但有了比较好区分--从0开始【已废弃这个想法】
+  #技术水准有限拆不开，就写个点赞-二次点赞--取消点赞的闭环了；
+
   -
-    case: "贴子详情页--点赞&取消点赞--用接口校验"
+    case: "贴子详情页--点赞--二次点赞---取消点赞--校验"
     tractate_id: 175152
     reply_id: ""
     data_type: "user_post"
@@ -12,7 +15,7 @@ tractate_vote:
 
 
   -
-    case: "贴子详情页--一级评论点赞&取消点赞--用接口校验"
+    case: "贴子详情页--一级评论点赞--二次点赞--取消点赞--校验"
     tractate_id: 175152
     reply_id: "2167124"
     data_type: "user_post"
@@ -22,3 +25,100 @@ tractate_vote:
     message2: "取消点赞成功"
 
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+#  -
+#    case: "贴子详情页--点赞&取消点赞--用接口校验 --测试单纯点赞"
+#    tractate_id: 175152
+#    reply_id: ""
+#    data_type: "user_post"
+#    current_city_id: "beijing"
+#    assert1:  0
+#    message: "点赞成功"
+#    position: 0
+#  -
+#    case: "贴子详情页--点赞&取消点赞--用接口校验--二次点赞校验"
+#    tractate_id: 175152
+#    reply_id: ""
+#    data_type: "user_post"
+#    current_city_id: "beijing"
+#    assert1:  0
+#    message: "点赞成功"
+#    position: 1
+#  -
+#    case: "贴子详情页--点赞&取消点赞--用接口校验---取消点赞"
+#    tractate_id: 175152
+#    reply_id: ""
+#    data_type: "user_post"
+#    current_city_id: "beijing"
+#    assert1:  0
+#    message: "取消点赞成功"
+#    position: 2
+##
+#  -
+#    case: "贴子详情页--一级评论点赞--用接口校验"
+#    tractate_id: 175152
+#    reply_id: "2167124"
+#    data_type: "user_post"
+#    current_city_id: "beijing"
+#    assert1:  0
+#    message: "点赞成功"
+#    position: 0
+#
+#  -
+#    case: "贴子详情页--一级评论点赞--用接口校验"
+#    tractate_id: 175152
+#    reply_id: "2167124"
+#    data_type: "user_post"
+#    current_city_id: "beijing"
+#    assert1:  0
+#    message: "点赞成功"
+#    position: 1
+#
+#
+#  -
+#    case: "贴子详情页--一级评论取消点赞--用接口校验"
+#    tractate_id: 175152
+#    reply_id: "2167124"
+#    data_type: "user_post"
+#    current_city_id: "beijing"
+#    assert1: 0
+#    message: "取消点赞成功"
+#    position: 2
+#
+#
+#
+
+#    case: "贴子详情页--一级评论点赞&取消点赞--用接口校验"
+#    tractate_id: 175152
+#    reply_id: "2167124"
+#    data_type: "user_post"
+#    current_city_id: "beijing"
+#    assert1:  0
+#    message1: "点赞成功"
+#    message2: "取消点赞成功"
+#
+

test_backend_data/user_data/follow_add.yaml

+follow_add:
+#关注
+  -
+    case: "关注主播"
+    uid: 33909625
+    from_live: 4196
+    assert: 0
+    assert1: 请登录后再试
+
+#未登录
+ # -
+ #   case: "未登录"
+  #  uid: 33909625
+   # from_live: 4196
+    #assert1: 请登录后再试

test_backend_data/user_data/follow_del.yaml

+follow_del:
+#取消关注
+  -
+    case: "取消关注"
+    uid: 33909625
+    from_live: 4196
+    assert: 0