Commit 45cbf366 authored by 邓莹莹's avatar 邓莹莹

增加日志

parent 22cd1382
_gtid=36d6a83003e711ecaa8e9e5bde4093e89005;sessionid=iqdrg0akgr3k0ohktjr881nkisljhvrf
\ No newline at end of file
_gtid=bfe7ab6303eb11ecb7c39e5bde4093e8181;sessionid=h25duaic55gseudqxcyuzxsn00voufvu
\ No newline at end of file
......@@ -14,6 +14,7 @@ class TestLoginVfc:
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"])
print("返回结果", r)
if r["error"] == 0:
assert r["data"]["account_phone"] == param["assert"]
if r["error"] == 1:
......
......@@ -14,6 +14,7 @@ class TestLoginPasswd:
def test_login_passwd(self,param):
print(param["password"])
r = send_reqest().login_passwd(param["current_city_id"], param["phone"], param["password"])
print("返回结果", r)
if r["error"] == 1:
assert r["message"] == param["assert"]
......
......@@ -13,6 +13,7 @@ class TestDetail:
@pytest.mark.parametrize("param",detail_data,ids=detail_case)
def test_detail(self,param):
r = answer_request().detail(param["current_city_id"], param["answer_id"])
print("返回结果", r)
assert r["error"] == 0
......@@ -13,5 +13,6 @@ class TestVote:
@pytest.mark.parametrize("param", vote_data, ids=vote_case)
def test_vote(self, param):
r = answer_request().vote(param["current_city_id"],param["answer_id"])
print("返回结果", r)
if r["error"] == 1:
assert r["message"] == "已经赞过啦"
......@@ -14,6 +14,7 @@ class TestReply:
def test_reply(self, param):
# 日记贴的评论列表
r = common_request().diary_common_reply(param["id"], param["type"],param["start_num"])
print("返回结果", r)
assert r["error"] == 0
......
......@@ -13,6 +13,7 @@ class TestRrplySubReply:
@pytest.mark.parametrize("param", topic_sub_common_data, ids=topic_sub_common_case)
def test_reply_sub_reply(self, param):
r = common_request().topic_sub_common(param["id"], param["type"], param["reply_id"],param["offset"],param["start_num"])
print("返回结果", r)
assert r["error"] == 0
......
......@@ -14,6 +14,7 @@ class TestDetailMessageid:
@pytest.mark.parametrize("param",detailmessageid_data,ids=detailmessageid_case)
def test_detail_messageid(self,param):
r = conversation_request().detail_messageid(param["os_version"], param["last_msg_id"], param["offset_msg_id"])
print("返回结果", r)
if r["error"] == 0:
results = r.get("data").get("results", [])
assert len(results) <= param["assert"]
......@@ -15,5 +15,6 @@ class TestMessageRead:
@pytest.mark.parametrize("param",messageread_data,ids=messageread_case)
def test_message_read(self,param):
r = conversation_request().message_read(param["current_city_id"], param["release"], param["message_ids"])
print("返回结果", r)
assert r["error"] == 0
......@@ -13,6 +13,7 @@ class TestDiaryOperation:
@pytest.mark.parametrize("param", diary_operation_data, ids=diary_operation_case)
def test_diary_operation(self, param):
r = diary_request().diary_operation(param["start_num"], param["count"])
print("返回结果", r)
# result = diary_request().diary_operation()
if r["error"] == 1:
assert r["message"] == param["assert"]
......
......@@ -13,6 +13,7 @@ class TestDiaryPreCreateTop:
@pytest.mark.parametrize("param", diary_pre_create_topic_data, ids=diary_pre_create_topic_case)
def test_diary_pre_create_topic(self, param):
r = diary_request().diary_pre_create_topic(param["diary_id"])
print("返回结果", r)
# result = diary_request().diary_operation()
if r["error"] == 1:
assert r["message"] == param["assert"]
......
......@@ -15,6 +15,7 @@ class TestDiaryService:
# print(2)
r = diary_request().diary_service(param["diary_id"],param["service_id"])
# print(r)
print("返回结果", r)
if r["error"] == 0:
assert r["error"] == param["assert"]
# 先判断有没有日记,然后判断日记本里面需要的那些字段,如点赞字段,日记总数等,不传值,传空值
......
......@@ -14,7 +14,7 @@ class TestTopicData:
def test_topic_data(self,param):
# print(2)
r = diary_request().diary_data(param["current_city_id"], param["diary_referrer"], param["sort"], param["count"], param["start_num"])
# print(r)
print("返回结果", r)
if r["error"] == 0:
assert r["error"] == param["assert"]
# 先判断有没有日记,然后判断日记本里面需要的那些字段,如点赞字段,日记总数等,不传值,传空值
......
......@@ -13,6 +13,6 @@ class TestArticle:
@pytest.mark.parametrize("param", article_data, ids=article_case)
def test_article(self, param):
r = doctor_request().article(param["doctor_id"])
print("返回结果", r)
if r["error"] == 0:
assert r["error"] == param["assert_error"]
......@@ -13,6 +13,6 @@ class TestDetail:
@pytest.mark.parametrize("param", detail_data, ids=detail_case)
def test_detail(self, param):
r = doctor_request().detail()
print("返回结果", r)
if r["error"] == 0:
assert r["error"] == param["assert_error"]
......@@ -13,6 +13,6 @@ class TestDiary:
@pytest.mark.parametrize("param", diary_data, ids=diary_case)
def test_diary(self, param):
r = doctor_request().diary(param["doctor_id"])
print("返回结果", r)
if r["error"] == 0:
assert r["error"] == param["assert_error"]
......@@ -13,6 +13,6 @@ class TestServices:
@pytest.mark.parametrize("param", services_data, ids=services_case)
def test_services(self, param):
r = doctor_v2_request().services()
print("返回结果", r)
if r["error"] == 0:
assert r["error"] == param["assert_error"]
......@@ -14,6 +14,7 @@ class TestDiaryCards:
@pytest.mark.parametrize("param",eyelidsDiaryCards_data,ids=eyelidsDiaryCards_case)
def test_diary_cards(self,param):
r = eyelids_request().diary_cards(param["current_city_id"], param["page"], param["page_size"],param["tag_names"])
print("返回结果", r)
assert r["error"] == 0
assert len(r["data"]) == 10
......
......@@ -13,6 +13,7 @@ class TestDiaryCards:
@pytest.mark.parametrize("param",FaceDiaryCards_data,ids=FaceDiaryCards_case)
def test_diary_cards(self,param):
r = face_request().diarys_cards(param["facial_type2tag_names"])
print("返回结果", r)
if r["error"] == 0:
feed = r["data"]
assert len(feed) == param["assert_feed_nums"]
......
......@@ -14,6 +14,7 @@ class TestPlasticFeeds:
@pytest.mark.parametrize("param",plasticfeeds_data,ids=plasticfeeds_case)
def test_plastic_feeds(self,param):
r = face_request().plastic_feeds(param["tag_id"], param["face_id"], param["tag_id_list"], param["page_size"], param["version"])
print("返回结果", r)
assert r["error"] == 0
......
......@@ -13,6 +13,7 @@ class TestCommunity:
@pytest.mark.parametrize("param", community_data, ids=community_case)
def test_community(self, param):
r = feed_request().community(param["version"], param["tabtype"], param["tags_id"], param["tab_id"])
print("返回结果", r)
if r["error"] == 0:
assert r["data"]["features"][0] != param["assert"]
# else:
......
......@@ -13,6 +13,7 @@ class TestConfigList:
@pytest.mark.parametrize("param",configlist_data,ids=configlist_case)
def test_config_list(self,param):
r = feed_request().config_list(param["version"])
print("返回结果", r)
if r["error"] == 0:
assert r["data"]["config_list"][0]["type"] != param["assert"]
# else:
......
......@@ -13,6 +13,7 @@ class TestFreeRecruitBanner:
@pytest.mark.parametrize("param", free_recruit_banner_data, ids=free_recruit_banner_case)
def test_free_recruit_case(self, param):
r = feed_request().free_recruit_banner(param["version"], param["json"])
print("返回结果", r)
if r["error"] == 0:
assert r["data"]["banner"] != param["assert"]
......
......@@ -13,6 +13,7 @@ class TestFreeRecruitList:
@pytest.mark.parametrize("param", free_recruit_list_data, ids=free_recruit_list_case)
def test_free_recruit_list(self, param):
r = feed_request().free_recruit_list(param["version"], param["json"], param["tab_type"], param["page"],param["size"])
print("返回结果", r)
if r["error"] == 0:
assert r["data"]["free_recruits"] != param["assert"]
......
......@@ -13,6 +13,7 @@ class TestIndexV9:
@pytest.mark.parametrize("param",indexv9_data,ids=indexv9_case)
def test_index_v9(self,param):
r = feed_request().index_v9(param["tabtype"], param["version"], param["current_city_id"])
print("返回结果", r)
if r["error"] == 0:
features = r.get("data").get("features",[])
assert len(features) > param["assert"]
......
......@@ -13,7 +13,6 @@ class TestServiceHomeCityV2:
@pytest.mark.parametrize("param", servicehomecityv2_data, ids=servicehomecityv2_case)
def test_service_home_city_v2(self, param):
r = filter_request().service_home_city_v2(param["current_city_id"], param["lat"], param["lng"])
# print('feng=', r)
print("返回结果", r)
if r["error"] == 0:
assert len(r["data"]["area"]) > 0
......@@ -13,6 +13,7 @@ class TestPlasticChecckStyleClasstify:
@pytest.mark.parametrize("param",plasticchecckstyleclasstify_data,ids=plasticchecckstyleclasstify_case)
def test_plastic_cheek_style_classify(self,param):
r = gmai_request().plastic_cheek_style_classify(param["version"])
print("返回结果", r)
if r["error"] == 0:
classifies = r["data"]["classifies"]
assert len(classifies) > param["assert"]
......@@ -13,6 +13,7 @@ class TestSimulateConf:
@pytest.mark.parametrize("param",simulateconf_data,ids=simulateconf_case)
def test_plastic_conf(self,param):
r = gmai_request().simulate_conf(param["type_id"])
print("返回结果", r)
assert r["error"] == 0
# 模拟发型数据,发型类型
......
......@@ -13,6 +13,7 @@ class TestSkinUserHadTest:
@pytest.mark.parametrize("param", skinhadtest_data, ids=skinhadtest_case)
def test_skin_user_hadused(self, param):
r = gmai_request().skin_user_had_test(param["device_id"])
print("返回结果", r)
if r["error"] == 0:
data = r.get("data").get("user_have_scan_skin")
assert data is param["assert"]
......
......@@ -13,6 +13,6 @@ class TestDiary:
@pytest.mark.parametrize("param", diary_data, ids=diary_case)
def test_diary(self, param):
r = hospital_request().diary(param["hospital"])
print("返回结果", r)
if r["error"] == 0:
assert r["error"] == param["assert_error"]
......@@ -13,7 +13,7 @@ class TestDetail:
@pytest.mark.parametrize("param", detail_data, ids=detail_case)
def test_detail(self, param):
r = hospitals_request().detail()
print("返回结果", r)
assert r["error"] == param["assert_error"]
......
......@@ -13,7 +13,7 @@ class TestDoctor:
@pytest.mark.parametrize("param", doctor_data, ids=doctor_case)
def test_doctor(self, param):
r = hospitals_request().doctor()
print("返回结果", r)
assert r["error"] == param["assert_error"]
......
......@@ -13,7 +13,7 @@ class TestServices:
@pytest.mark.parametrize("param", services_data, ids=services_case)
def test_detail(self, param):
r = hospitals_v2_request().services()
print("返回结果", r)
assert r["error"] == 0
......
......@@ -13,6 +13,7 @@ class TestDiaryVote:
@pytest.mark.parametrize("param", diary_vote_data, ids=diary_vote_case)
def test_api_topic_vote(self, param):
r = hybrid_api_topic_request().diary_detail(param["topic_id"])
print("返回结果", r)
assert r["error"] == param["assert1"]
......
......@@ -14,6 +14,7 @@ class TestBaseWikiProduct:
@pytest.mark.parametrize("param", basewiki_product_data, ids=basewiki_product_case)
def test_basewiki_product(self, param):
r = hybrid_request().basewiki_product(param["version"])
print("返回结果", r)
soup = BeautifulSoup(r, 'html.parser') # html.parser是解析器,也可是lxml
assert soup.title.string == param["assert"]
print('进入项目百科-菲洛嘉的百科详情页')
\ No newline at end of file
......@@ -14,6 +14,7 @@ class TestBrand:
@pytest.mark.parametrize("param", brand_data, ids=brand_case)
def test_brand(self, param):
r = hybrid_request().brand(param["version"])
print("返回结果", r)
soup = BeautifulSoup(r, 'html.parser') # html.parser是解析器,也可是lxml
assert soup.title.string == param["assert"]
print('进入项目百科-得玛莎的百科详情页')
\ No newline at end of file
......@@ -13,7 +13,7 @@ class TestDiaryAlbum:
@pytest.mark.parametrize("param", diary_album_data, ids=diary_album_case)
def test_diary_album(self, param):
r = hybrid_diary_request().diary_album()
# print(r)
print("返回结果", r)
assert r["error"] == param["assert"]
......
......@@ -14,6 +14,7 @@ class TestQuestionNewAnswerLiist:
@pytest.mark.parametrize("param", test_data, ids=test_case)
def test_question_v1(self, param):
r = hybrid_request().question_new_answer_list(param["question_id"])
print("返回结果", r)
if r["error"] == 0:
if r["data"]["answers_list"]:
# 看下是否有回答
......
......@@ -14,6 +14,7 @@ class TestQuestionV1:
@pytest.mark.parametrize("param", test_data, ids=test_case)
def test_question_v1(self, param):
r = hybrid_request().question_v1()
print("返回结果", r)
assert r["error"] == param["error"]
if r["error"] == 0:
assert r["config"]["has_login"] is not None and r["config"]["has_login"] is not ""
......
......@@ -14,6 +14,7 @@ class TestSubWiki:
@pytest.mark.parametrize("param", subwiki_data, ids=subwiki_case)
def test_sub_wiki(self, param):
r = hybrid_request().sub_wiki(param["version"], param["current_city_id"])
print("返回结果", r)
soup = BeautifulSoup(r, 'html.parser') # html.parser是解析器,也可是lxml
assert soup.title.string == param["assert"]
print('进入项目聚合百科-玻尿酸的百科详情页')
\ No newline at end of file
......@@ -13,7 +13,7 @@ class TestGiftListData:
@pytest.mark.parametrize("param", gift_list_data_data, ids=gift_list_data_case)
def test_gift_list_data(self, param):
r = hybrid_gift_list_request().gift_list_data(param["service_id"], param["gift_type"], param["page"])
print("返回结果", r)
if r["error"] == 0:
assert r["error"] == param["assert_error"]
......
......@@ -13,7 +13,7 @@ class TestTelatedServiceData:
@pytest.mark.parametrize("param", related_service_data_data, ids=related_service_data_case)
def test_related_service_data(self, param):
r = hybrid_promotion_request().related_service_data(param["service_id"], param["page"])
print("返回结果", r)
if r["error"] == 0:
assert r["error"] == param["assert_error"]
......@@ -13,6 +13,6 @@ class TestBeautyCardDetail:
@pytest.mark.parametrize("param", beauty_card_detail_data, ids=beauty_card_detail_case)
def test_beauty_card_detail(self, param):
r = janus_request().beauty_card_detail(param["spu_id"], param["sku_id"], param["welfareId"], param["version"], param["current_city_id"], param["lat"], param["lng"])
print("返回结果", r)
if r["error"] == 0:
assert len(r["data"]["beautycart_list"]) > param["assert"]
......@@ -14,6 +14,7 @@ class TestBeautyCardOrderDetailUsed:
@pytest.mark.parametrize("param", beauty_card_order_detail_used_data, ids=beauty_card_order_detail_used_case)
def test_beauty_card_order_detail_used(self, param):
r = janus_request().beauty_card_order_detail(param["order_id"])
print("返回结果", r)
data = r["data"]
assert data["order_status"] == param["order_status"]
assert data["vertifi_detail"] == {}
......
......@@ -14,6 +14,7 @@ class TestBeautyCardOrderDetailUsing:
@pytest.mark.parametrize("param", beauty_card_order_detail_using_data, ids=beauty_card_order_detail_using_case)
def test_beauty_card_order_detail_used(self, param):
r = janus_request().beauty_card_order_detail(param["order_id"])
print("返回结果", r)
data = r["data"]
assert data["order_status"] == param["order_status"]
assert data["vertifi_detail"]["vertifi_count"] == param["vertifi_count"]
......
......@@ -14,6 +14,7 @@ class TestBeautyCardOrderDetailWaitUse:
@pytest.mark.parametrize("param", beauty_card_order_detail_waituse_data, ids=beauty_card_order_detail_waituse_case)
def test_beauty_card_order_detail_used(self, param):
r = janus_request().beauty_card_order_detail(param["order_id"])
print("返回结果", r)
data = r["data"]
assert data["order_status"] == param["order_status"]
assert data["vertifi_detail"]["vertifi_count"] == param["vertifi_count"]
......
......@@ -16,7 +16,7 @@ class TestBeautyCardOrderSubmit:
r = janus_request().beauty_card_order_submit(param["phone"], param["sku_id"], param["number"],
param["is_doctor_see"], param["gain_coupon_id"],
param["deduction_price"])
print("返回结果", r)
if r["error"] == 0:
assert r["error"] == param["assert_error"]
......@@ -16,7 +16,7 @@ class TestBeautyCardPaymentDelete:
payment = janus_request().beauty_card_order_submit("12345678912", "10176", 1, 1, 0, 0)
payment_id = payment["data"]["payment_id"]
r = janus_request().beauty_card_payment_delete(payment_id)
print("返回结果", r)
if r["error"] == 0:
assert r["data"]["message"] == param["assert_data_message"]
......@@ -16,7 +16,7 @@ class TestBeautyCardPaymentDetail:
payment = janus_request().beauty_card_order_submit("12345678912", "10176", 1, 1, 0, 0)
payment_id = payment["data"]["payment_id"]
r = janus_request().beauty_card_payment_detail(payment_id)
print("返回结果", r)
if r["error"] == 0:
assert r["error"] == param["assert_error"]
......@@ -16,7 +16,7 @@ class TestBeautyCardPaymentMethod:
payment = janus_request().beauty_card_order_submit("12345678912", "10176", 1, 1, 0, 0)
payment_id = payment["data"]["payment_id"]
r = janus_request().beauty_card_payment_method(payment_id)
print("返回结果", r)
if r["error"] == 0:
assert r["error"] == param["assert_error"]
......@@ -16,7 +16,7 @@ class TestBeautyCardPrepayAlipay:
payment = janus_request().beauty_card_order_submit("12345678912", "10176", 1, 1, 0, 0)
payment_id = payment["data"]["payment_id"]
r = janus_request().beauty_card_prepay_alipay(param["is_huabei"], payment_id)
print("返回结果", r)
if r["error"] == 0:
assert r["error"] == param["assert_error"]
......@@ -16,7 +16,7 @@ class TestBeautyCardPrepayWechat:
payment = janus_request().beauty_card_order_submit("12345678912", "10176", 1, 1, 0, 0)
payment_id = payment["data"]["payment_id"]
r = janus_request().beauty_card_prepay_wechat(payment_id)
print("返回结果", r)
if r["error"] == 0:
assert r["error"] == param["assert_error"]
......@@ -14,7 +14,7 @@ class TestBeautyCardRefundInfo:
@pytest.mark.parametrize("param", beauty_card_refund_info_data, ids=beauty_card_refund_info_case)
def test_beauty_card_refund_info(self, param):
r = janus_request().beauty_card_refund_info(param["order_id"])
print("返回结果", r)
if r["error"] == 0:
assert r["error"] == param["assert_error"]
......@@ -15,7 +15,7 @@ class TestBeautyCardRefundSubmit:
def test_beauty_card_refund_submit(self, param):
r = janus_request().beauty_card_refund_submit(param["order_id"], param["reason_id"], param["reason_text"],
param["reason_type"])
print("返回结果", r)
if r["error"] == 1:
assert r["message"] == param["assert_message"]
......@@ -14,7 +14,7 @@ class TestBeautyCardUpdatePhone:
@pytest.mark.parametrize("param", beauty_card_update_phone_data, ids=beauty_card_update_phone_case)
def test_beauty_card_update_phone(self, param):
r = janus_request().beauty_card_update_phone(param["authorize_phone"], param["authorize_phone_type"], param["vfc_code"])
print("返回结果", r)
if r["error"] == 1:
assert r["message"] == param["assert_message"]
......@@ -15,6 +15,7 @@ class TestContentV7:
def test_content_v7(self, param):
print(param['query'])
r = janus_request().content_v7(param["query"], param["device_id"], param["current_city_id"], param["version"], param["is_first"], param["tab_type"], param["offset"])
print("返回结果", r)
if r["error"] == 0:
assert r["data"]["cards"][0]["type"] == param["assert"]
if r["error"] == 1:
......
......@@ -15,6 +15,7 @@ class TestHospitalSearch:
def test_hospital_search(self, param):
print(param['query'])
r = janus_request().hospital_search(param["query"], param["device_id"], param["hospital_id"], param["current_city_id"], param["version"], param["offset"], param["size"])
print("返回结果", r)
if r["error"] == 0:
assert len(r["data"]["search_skus"]) != param["assert1"]
assert len(r["data"]["remai_skus"]) == param["assert2"]
......
......@@ -15,6 +15,7 @@ class TestKeywordTip:
def test_keyword_tip(self, param):
print(param['query'])
r = janus_request().keyword_tip(param["query"], param["lat"], param["lng"], param["version"])
print("返回结果", r)
if not r["data"]["aggregation_card"]:
print('医生医院卡片信息')
assert r["data"]["tip_keys"][0]["type_flag"] == param["assert1"]
......
......@@ -14,6 +14,6 @@ class TestMineGuessYouLike:
@pytest.mark.parametrize("param", mine_guess_you_like_data, ids=mine_guess_you_like_case)
def test_mine_guess_you_like(self, param):
r = janus_request().mine_guess_you_like()
print("返回结果", r)
if r["error"] == 0:
assert r["error"] == param["assert_error"]
......@@ -14,6 +14,6 @@ class TestPageRules:
@pytest.mark.parametrize("param", page_rules_data, ids=page_rules_case)
def test_page_rules(self, param):
r = janus_request().page_rules(param["version"], param["current_city_id"], param["page_name"])
print("返回结果", r)
if r["error"] == 0:
assert r["error_code"] == param["assert"]
......@@ -14,7 +14,7 @@ class TestProductCouponMyList:
@pytest.mark.parametrize("param", product_coupon_my_list_data, ids=product_coupon_my_list_case)
def test_product_coupon_my_list(self, param):
r = janus_request().product_coupon_my_list(param["start_num"], param["tab_id"])
print("返回结果", r)
if r["error"] == 0:
assert r["error"] == param["assert_error"]
......@@ -14,7 +14,7 @@ class TestProductDetail:
@pytest.mark.parametrize("param", product_detail_data, ids=product_detail_case)
def test_product_detail(self, param):
r = janus_request().product_detail(param["service_id"], param["service_item_id"], param["version"])
print("返回结果", r)
if r["error"] == 0:
assert r["error"] == param["assert_error"]
if r["error"] == 1:
......
......@@ -14,6 +14,7 @@ class TestProductMyLiSt:
@pytest.mark.parametrize("param", product_my_list_detail_data, ids=product_my_list_detail_case)
def test_product_my_list(self, param):
r = janus_request().product_my_list(param["start_num"], param["tab_id"])
print("返回结果", r)
assert r["error"] == 0
coupon_list = r["data"]["coupon_list"]
......
......@@ -13,6 +13,7 @@ class TestResourceBit:
@pytest.mark.parametrize("param", resource_bit_data, ids=resource_bit_case)
def test_product_detail(self, param):
r = janus_request().resource_bit()
print("返回结果", r)
assert r["error"] == param["assert"]
# assert r["message"] == param["assert_version_message"]
......@@ -14,6 +14,6 @@ class TestServiceHospital:
@pytest.mark.parametrize("param", service_hospital_data, ids=service_hospital_case)
def test_service_hospital(self, param):
r = janus_request().service_hospital(param["offset"], param["sku_id"], param["size"], param["version"], param["current_city_id"], param["lat"], param["lng"])
print("返回结果", r)
if r["error"] == 0:
assert len(r["data"]["service_hospital_list"]) > param["assert"]
......@@ -14,7 +14,7 @@ class TestSkuInfo:
@pytest.mark.parametrize("param", sku_info_data, ids=sku_info_case)
def test_sku_info(self, param):
r = janus_request().sku_info(param["service_id"], param["service_item_id"])
print("返回结果", r)
if r["error"] == 0:
assert r["error"] == param["assert_error"]
......@@ -15,7 +15,7 @@ class TestTagService:
def test_tag_service(self, param):
r = janus_request().tag_service(param["size"], param["tag_ids"], param["offset"], param["tag_id"], param["version"], param["device_id"])
#print('feng=', r)
print("返回结果", r)
if r["error"] == 0:
assert r["error"] == param["assert"]
assert r["data"]["offset"] == param["offset"]
......@@ -14,6 +14,7 @@ class TestDanmuV2:
def test_danmu_v2(self,param):
print(param)
r = living_request().danmu_v2(param["channel_id"],param["msg_id"],param["user_id"])
print("返回结果", r)
if r["error"] == 0:
assert r["error"] == param["assert"]
else:
......
......@@ -15,6 +15,7 @@ class TestMyConversation:
def test_my_conversation(self,param):
'''私信列表'''
r = my_conversation_request().my_conversation(param["current_city_id"], param["start_num"], param["count"])
print("返回结果", r)
if r["error"] == 0:
conversation_list = r.get("data").get("conversation_list", [])
assert len(conversation_list) <= param["assert"]
......
......@@ -14,6 +14,7 @@ class TestUnread:
@pytest.mark.parametrize("param",unread_data,ids=unread_case)
def test_unread(self,param):
r = notification_request().unread(param["uqid"], param["trace_id"])
print("返回结果", r)
#print("返回结果是:%s" % r)
total_count = r["data"]["unread_count"]["total_count"]
print("总数量是:%s" % total_count)
......
......@@ -15,6 +15,7 @@ class TestRecomendServices:
@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"])
print("返回结果", r)
if r["error"] == 0:
data = r.get("data")
assert len(data) == param["assert"]
......
......@@ -18,6 +18,7 @@ class TestShareV4:
@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"])
print("返回结果", r)
assert r["error"] == 0
......@@ -14,6 +14,6 @@ class TestMyStatus:
@pytest.mark.parametrize("param", my_status_data, ids=my_status_case)
def test_my_status(self, param):
r = orders_request().my_status()
print("返回结果", r)
if r["error"] == 0:
assert r["error"] == param["assert_error"]
......@@ -14,6 +14,7 @@ class TestOrdersMyV2Waituse:
@pytest.mark.parametrize("param",my_order_waituse_data,ids=my_order_waituse_case)
def test_orders_waituse(self,param):
r = orders_request().my_v2(param["start_num"], param["status"], param["version"])
print("返回结果", r)
if r["error"] == 0:
orders = r["data"]["orders"]
for order in orders:
......
......@@ -13,8 +13,12 @@ class TestPersonalRecommends:
@pytest.mark.parametrize("param", personal_recommends_data, ids=personal_recommends_case)
def test_personal_recommends(self, param):
r = personal_recommends_request().personal_recommends( param["current_city_id"], param["id"], param["from_type"] )
# print(r)
assert r["error"] == param["assert_error"]
print("返回结果", r)
if r["error"] == 1:
assert r["message"] == "没有更多数据了"
else:
assert r["error"] == 0
# assert r["data"]["text"] == param["assert_text"]
# if r["error"] == 21001:
# assert r["message"] == param["assert_message1"]
\ No newline at end of file
......@@ -14,6 +14,7 @@ class TestFavor:
@pytest.mark.parametrize("param", test_data, ids=test_case)
def test_favor(self, param):
r = qa_request().favor(param["answer_id"])
print("返回结果", r)
assert r["error"] == param["error"]
r = qa_request().cancelfavor(param["answer_id"])
......
......@@ -13,5 +13,6 @@ class TestReplyAnswer:
@pytest.mark.parametrize("param", replyanswer_data, ids=replyanswer_case)
def test_reply_answer(self, param):
r = question_request().reply_answer(param["current_city_id"],param["answer_id"],param["content"],param["user_id"])
print("返回结果", r)
if r["message"] == "操作成功":
assert r["message"] == param["assert"]
......@@ -14,5 +14,6 @@ class TestScanDiaryCards:
@pytest.mark.parametrize("param",scandiarycards_data,ids=scandiarycards_case)
def test_diary_cards(self,param):
r = scan_request().scan_diary_cards(param["current_city_id"], param["page"], param["count"], param["feature_results"],param["feed_type"])
print("返回结果", r)
assert r["error"] == 0
assert len(r["data"]) == param["assert_nums"]
\ No newline at end of file
......@@ -18,6 +18,7 @@ class TestContentV6:
def test_content_v6(self, param):
print(param['query'])
r = search_request().content_v6(param["query"], param["device_id"], param["current_city_id"], param["version"], param["is_first"], param["tab_type"], param["offset"], param["size"])
print("返回结果", r)
if r["error"] == 0:
if param["tab_type"] == 3:
assert r["data"]["hospitals"][0]["name"] == param["assert"]
......
......@@ -14,7 +14,6 @@ class TestHospital:
@pytest.mark.parametrize("param", hospital_data, ids=hospital_case)
def test_hospital(self, param):
r = search_request().hospital(param["cp_id"], param["tag_id"], param["q"], param["count"], param["device_id"])
# print('feng=', r)
print("返回结果", r)
if r["error"] == 0:
assert r["data"] != param["assert"]
......@@ -14,6 +14,7 @@ class TestHot:
@pytest.mark.parametrize("param", hot_data, ids=hot_case)
def test_hot(self, param):
r = search_request().hot(param["version"])
print("返回结果", r)
if r["error"] == 0:
print("接口调用成功了~")
assert len(["data"]) != param["assert"]
\ No newline at end of file
......@@ -14,6 +14,7 @@ class TestKeywords:
@pytest.mark.parametrize("param", keywords_data, ids=keywords_case)
def test_keywords(self, param):
r = search_request().keywords(param["current_city_id"], param["search_tab"])
print("返回结果", r)
if r["error"] == 0:
assert r["error"] == param["assert"]
......
......@@ -14,7 +14,7 @@ class TestServiceFavor:
@pytest.mark.parametrize("param", service_favor_data, ids=service_favor_case)
def test_service_favor(self, param):
r = service_request().service_favor()
print("返回结果", r)
if r["error"] == 0:
assert r["message"] == param["assert_message"]
......
......@@ -14,7 +14,7 @@ class TestShareData:
@pytest.mark.parametrize("param", share_data_data, ids=share_data_case)
def test_share_data(self, param):
r = services_request().share_data(param["p_id"], param["u_id"])
print("返回结果", r)
if r["error"] == 0:
assert r["error"] == param["assert_error"]
......
......@@ -14,6 +14,6 @@ class TestAdd:
@pytest.mark.parametrize("param", add_data, ids=add_case)
def test_add(self, param):
r = shopcart_request().add(param["from_live"], param["number"], param["service_item_id"])
print("返回结果", r)
if r["error"] == 0:
assert r["message"] == param["assert_message"]
......@@ -14,6 +14,6 @@ class TestList:
@pytest.mark.parametrize("param", list_data, ids=list_case)
def test_list(self, param):
r = shopcart_request().list()
print("返回结果", r)
if r["error"] == 0:
assert r["error"] == param["assert_error"]
......@@ -15,6 +15,7 @@ class TestSkinRecommendServices:
def test_recommend_services(self,param):
r = skin_request().skin_recommend_service(param["device_id"], param["current_city_id"], param["appeal_tag_ids"],
param["offset"], param["size"])
print("返回结果", r)
if r["error"] == 0:
services = r["data"]["services"]
assert len(services) == param["assert_nums"]
......@@ -15,6 +15,7 @@ class TestTopicReplyCreate:
@pytest.mark.parametrize("param", topic_reply_create_data, ids=topic_reply_create_case)
def test_topic_reply_create(self, param):
r = topic_reply_create_request().topic_reply_create( param["content"], param["channel"] )
print("返回结果", r)
# 一级评论三种情况校验,回复成功,回复频繁,回复重复
if r["error"] == 0:
assert r["message"] == param["message1"]
......
......@@ -14,6 +14,7 @@ class TestTopicReplyVote:
@pytest.mark.parametrize("param", topic_reply_vote_data, ids=topic_reply_vote_case)
def test_topic_reply_vote(self, param):
r = topicreply_vote_request().topic_reply_vote(param["id"])
print("返回结果", r)
# 先点赞一次。看是否报重复点赞的错误,如果是就先取消点赞。最后回到取消点赞的状态
if r["error"] == 1:
assert r["message"] == param["assert3"]
......
......@@ -14,6 +14,7 @@ class TestTopicDetail:
@pytest.mark.parametrize("param", topic_detail_data, ids=topic_detail_case)
def test_v1(self, param):
r = topic_request().topic_detail(param["topic_id"])
print("返回结果", r)
assert r["error"] == param["assert1"]
if r["error"] == 0:
assert r["error"] == param["assert1"]
......
......@@ -15,6 +15,7 @@ class TestVote:
@pytest.mark.parametrize("param", topic_vote_data, ids=topic_vote_case)
def test_vote(self, param):
r = topic_request().topic_vote(param["topic_id"])
print("返回结果", r)
assert r["error"] == 0
......
......@@ -13,7 +13,7 @@ class TestTractateDetail:
@pytest.mark.parametrize("param", tractate_detail_data, ids=tractate_detail_case)
def test_detail(self, param):
r = tractate_request().tractate_detail( param["current_city_id"], param["tractate_id"], param["data_type"] )
# print(r)
print("返回结果", r)
assert r["error"] == param["assert_error"]
if r["error"] == 0:
assert r["error"] == param["assert_error"]
......
......@@ -14,7 +14,7 @@ class TestFavor:
@pytest.mark.parametrize("param", test_data, ids=test_case)
def test_favor(self, param):
r = tractate_request().favor(param["tractate_id"], param["data_type"])
# print(r)
print(r)
if r["error"] == 0:
assert r["message"] == param["message1"]
if r["error"] == 1:
......
......@@ -14,7 +14,7 @@ class TestPublishReply:
@pytest.mark.parametrize("param", test_data, ids=test_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)
print("返回结果", r)
assert r["error"] == param["error"]
if r["error"] == 0:
assert r["data"]["reply_data"]["content"] is not None and r["data"]["reply_data"]["content"] is not ""
......
......@@ -13,5 +13,5 @@ class TestRelatedService:
@pytest.mark.parametrize("param", related_service_data, ids=related_service_case)
def test_related_service(self, param):
r = tractate_request().tractate_related_service( param["current_city_id"], param["tractate_id"], param["data_type"] )
# print(r)
print(r)
assert r["error"] == 0
......@@ -13,7 +13,7 @@ class TestReply:
@pytest.mark.parametrize("param", test_data, ids=test_case)
def test_reply(self, param):
r = tractate_request().reply( param["current_city_id"], param["id"], param["data_type"] )
# print(r)
print(r)
assert r["error"] == param["assert_error"]
if r["error"] == 0:
# 先判断有没有值,然后判断里面需要的那些字段,如点赞字段,总数等,不传值,传空值
......
......@@ -15,6 +15,7 @@ class TestVote:
@pytest.mark.parametrize("param", test_data, ids=test_case)
def test_vote(self, param):
r = tractate_request().tractate_detail(param["current_city_id"], param["tractate_id"], param["data_type"])
print("返回结果", r)
assert r["error"] == 0
......
......@@ -14,6 +14,6 @@ class TestAnswer:
@pytest.mark.parametrize("param", answer_data, ids=answer_case)
def test_answer(self, param):
r = user_request().answer(param["user"])
print("返回结果", r)
if r["error"] == 0:
assert r["error"] == param["assert_error"]
......@@ -14,8 +14,7 @@ class TestPersonalCenter:
@pytest.mark.parametrize("param", personalcenter_data, ids=personalcenter_case)
def test_personal_center(self, param):
r = user_request().personal_center()
print('feng=', r)
print("返回结果", r)
if r["error"] == 0:
assert r["error"] == param["assert"]
assert r["data"]["user"]["portrait"] != param["portrait"]
......@@ -15,6 +15,7 @@ class TestTopicFavor:
def test_topic_favor(self, param):
# 收藏校验
r = user_request().topic_favor()
print("返回结果", r)
assert r["error"] == param["assert"]
# 取消收藏校验
r = user_request().topic_canclefavor()
......
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