merge common_dev

test_backend_case/janus_live_case/test_m_get_channel_status.py

@@ -2,6 +2,7 @@ import pytest
 
 import path_setting
 from all_backend_api.janus_live_request import live_request
+from all_backend_api.live_request import living_request
 from ids_list import get_ids
 from in_common.base_request import BaseRequest
 
@@ -13,6 +14,7 @@ class TestMGetChannelStatus:
     @pytest.mark.parametrize("param", m_get_channel_status_data, ids=m_get_channel_status_case)
     def test_m_get_channel_status_data(self, param):
         print("查看直播状态啦~~~")
+        living_request().pushlive_info("小冤家", "2021/04/22/1003/cef471cff5e6", "", "1", "1", "1")
         r = live_request().m_get_channel_status(param["channel_id"], param["version"])
         if r["error"] == 0:
             assert r["data"]["status"] == param["assert"]
\ No newline at end of file

test_backend_data/janus_data/content_v7.yaml

@@ -62,7 +62,7 @@ content_v7:
   -
     #搜索结果页-综合tab---搜索词为医院全称或简称，搜索结果页医院穿插置顶展示
     case: "搜索结果页-综合tab---搜索词为医院全称或简称，搜索结果页医院穿插置顶展示"
-    query: "北京凯润婷"
+    query: "北京画美"
     device_id: "1321222222222222135"
     current_city_id: "beijing"
     version: "742.2"

test_backend_data/janus_live_data/m_get_channel_status.yaml

@@ -2,6 +2,6 @@ m_get_channel_status:
 #查看直播状态
   -
     case: "查看直播状态"
-    channel_id: "745"
+    channel_id: "739"
     version: "7.45.0"
     assert : True
\ No newline at end of file