diff --git a/TestCase/FAQ/test_01_article_info.py b/TestCase/FAQ/test_01_article_info.py index 95153c02637f63914d68cd35a95e688256faae34..87e6f1bff4403e0cd813b3ab263e32101186d86f 100644 --- a/TestCase/FAQ/test_01_article_info.py +++ b/TestCase/FAQ/test_01_article_info.py @@ -11,4 +11,3 @@ class TestFAQ: @pytest.mark.parametrize('case',yaml_data) def test_article(self,case): req_handler.ReqHandler.send_requests(case=case,var_class=articleInfoTestData) - print(case) \ No newline at end of file diff --git a/TestCase/FAQ/test_02_article_opreate.py b/TestCase/FAQ/test_02_article_opreate.py index ceb195a50d8730474962553126d0cbad012edd65..1ac7496f0fc7ffd5618f4a814ffcdb87bcb2aaf3 100644 --- a/TestCase/FAQ/test_02_article_opreate.py +++ b/TestCase/FAQ/test_02_article_opreate.py @@ -11,4 +11,3 @@ class TestArticleOpreate: @pytest.mark.parametrize('case',yaml_data) def test_article_opreate(self,case): req_handler.ReqHandler.send_requests(case=case,var_class=articleOperateTestData) - print(case) \ No newline at end of file diff --git a/TestCase/FAQ/test_03_article_page_setting.py b/TestCase/FAQ/test_03_article_page_setting.py index a4948b6221ef57b93f2b03129583fc306b086e49..90724f27f667ed7af974563c43023c059e5481b2 100644 --- a/TestCase/FAQ/test_03_article_page_setting.py +++ b/TestCase/FAQ/test_03_article_page_setting.py @@ -11,4 +11,3 @@ class TestArticleOpreate: @pytest.mark.parametrize('case',yaml_data) def test_article_page_setting(self,case): req_handler.ReqHandler.send_requests(case=case,var_class=articlePageSettingTestData) - print(case) \ No newline at end of file diff --git a/TestCase/account/test_01_account.py b/TestCase/account/test_01_account.py index 98d9db77ce04fa880bb049be844f216f037d9a5e..0a0757fdf002b4fd1e3699202804907b56e1caea 100644 --- a/TestCase/account/test_01_account.py +++ b/TestCase/account/test_01_account.py @@ -12,4 +12,3 @@ class TestAccount: @pytest.mark.parametrize('case',yaml_data) def test_account(self,case): req_handler.ReqHandler.send_requests(case=case,var_class=accountData) - print(case) \ No newline at end of file diff --git a/TestCase/billing/test_01_buyPlan.py b/TestCase/billing/test_01_buyPlan.py index ac2ecd93d1b0ec354f9729a09b5c314c6535430f..6b024be30433eaa3ee7ab0152c47fce440c108cd 100644 --- a/TestCase/billing/test_01_buyPlan.py +++ b/TestCase/billing/test_01_buyPlan.py @@ -11,4 +11,3 @@ class TestBuyPlan: @pytest.mark.parametrize('case',yaml_data) def test_buy_plan(self,case): req_handler.ReqHandler.send_requests(case=case,var_class=buyPlanData) - print(case) \ No newline at end of file diff --git a/TestCase/customer/test_01_customer.py b/TestCase/customer/test_01_customer.py index 0c65666ff2c1cc8be17767ab1a8b477c96be3ed9..7489cd2dfc03ad43fddf373d731238f98402adc3 100644 --- a/TestCase/customer/test_01_customer.py +++ b/TestCase/customer/test_01_customer.py @@ -11,4 +11,3 @@ class TestCustomer: @pytest.mark.parametrize('case',yaml_data) def test_customer(self,case): req_handler.ReqHandler.send_requests(case=case,var_class=customerData) - print(case) \ No newline at end of file diff --git a/TestCase/inbox/test_01_livechat.py b/TestCase/inbox/test_01_livechat.py index 59a4167c686d3d0743d21857c4c5f4af259eaf27..06400ff8831949038a6a82142620c26d1efc98f6 100644 --- a/TestCase/inbox/test_01_livechat.py +++ b/TestCase/inbox/test_01_livechat.py @@ -11,4 +11,3 @@ class TestLivechat: @pytest.mark.parametrize('case',yaml_data) def test_livechat(self,case): req_handler.ReqHandler.send_requests(case=case,var_class=livechatData) - print(case) \ No newline at end of file diff --git a/TestCase/inbox/test_02_ticketStatus.py b/TestCase/inbox/test_02_ticketStatus.py index f04b46ac1777c7506fb890f4073a2128eaa8a37c..7410a906670b052539f4157d9f43ea77b333a4be 100644 --- a/TestCase/inbox/test_02_ticketStatus.py +++ b/TestCase/inbox/test_02_ticketStatus.py @@ -10,5 +10,4 @@ class TestTicketStatus: @pytest.mark.flaky(reruns=ticketStatusData.rerun, reruns_delay=ticketStatusData.rerun_delay) @pytest.mark.parametrize('case',yaml_data) def test_ticketStatus(self,case): - print(case) req_handler.ReqHandler.send_requests(case=case,var_class=ticketStatusData) diff --git a/TestCase/inbox/test_03_ticketOpreate.py b/TestCase/inbox/test_03_ticketOpreate.py index 38c7c2a1cec09368f2c0149abd33f5ea1bfad237..794cff2ddf2c57a5de57e45d81e9f25587e59466 100644 --- a/TestCase/inbox/test_03_ticketOpreate.py +++ b/TestCase/inbox/test_03_ticketOpreate.py @@ -14,5 +14,4 @@ class TestTicketOpreate: @pytest.mark.flaky(reruns=ticketStatusData.rerun, reruns_delay=ticketStatusData.rerun_delay) @pytest.mark.parametrize('case',yaml_data) def test_ticketOpreate(self,case): - print(case) req_handler.ReqHandler.send_requests(case=case,var_class=ticketStatusData) diff --git a/TestCase/inbox/test_04_ticketInfo.py b/TestCase/inbox/test_04_ticketInfo.py index d69327df0f70a9e8f1e58ee3f175febb9989ad6c..0ef3ac0365a877852325b849650a951bbd433a9a 100644 --- a/TestCase/inbox/test_04_ticketInfo.py +++ b/TestCase/inbox/test_04_ticketInfo.py @@ -10,5 +10,4 @@ class TestTicketInfo: @pytest.mark.flaky(reruns=ticketInfoData.rerun, reruns_delay=ticketInfoData.rerun_delay) @pytest.mark.parametrize('case',yaml_data) def test_ticketInfo(self,case): - print(case) req_handler.ReqHandler.send_requests(case=case,var_class=ticketInfoData) diff --git a/TestCase/inbox/test_05_team.py b/TestCase/inbox/test_05_team.py index f75d69c046e5b9668bbbd8a4916fce11aff6c626..1615f4ccdce22bd96a83f07aec17fcd88d7c4927 100644 --- a/TestCase/inbox/test_05_team.py +++ b/TestCase/inbox/test_05_team.py @@ -10,5 +10,4 @@ class TestTeam: @pytest.mark.flaky(reruns=teamData.rerun, reruns_delay=teamData.rerun_delay) @pytest.mark.parametrize('case',yaml_data) def test_team(self,case): - print(case) req_handler.ReqHandler.send_requests(case=case,var_class=teamData) diff --git a/TestCase/inbox/test_06_channel.py b/TestCase/inbox/test_06_channel.py index 0f7804e7cf7e332a92e21da31f92ba7f2af6ce2a..50907dd783b332ec0235392acd835fe569e719b2 100644 --- a/TestCase/inbox/test_06_channel.py +++ b/TestCase/inbox/test_06_channel.py @@ -10,5 +10,4 @@ class TestChannel: @pytest.mark.flaky(reruns=channelData.rerun, reruns_delay=channelData.rerun_delay) @pytest.mark.parametrize('case',yaml_data) def test_channel(self,case): - print(case) req_handler.ReqHandler.send_requests(case=case,var_class=channelData) diff --git a/TestCase/inbox/test_07_ticketDetail.py b/TestCase/inbox/test_07_ticketDetail.py index 862127ff22e4416f4d20f857dc5a52dffcf0105c..93102afe0b255fc95560735a91b01a313a200405 100644 --- a/TestCase/inbox/test_07_ticketDetail.py +++ b/TestCase/inbox/test_07_ticketDetail.py @@ -10,5 +10,4 @@ class TestTiocketDetail: @pytest.mark.flaky(reruns=ticketDetailData.rerun, reruns_delay=ticketDetailData.rerun_delay) @pytest.mark.parametrize('case',yaml_data) def test_ticketDetail(self,case): - print(case) req_handler.ReqHandler.send_requests(case=case,var_class=ticketDetailData) diff --git a/TestCase/report/test_01_report.py b/TestCase/report/test_01_report.py index fd264d5580993c7450012b5b4343591deaf4f520..4d176ba56d6681092bb5d408dc9147edb73ea5b5 100644 --- a/TestCase/report/test_01_report.py +++ b/TestCase/report/test_01_report.py @@ -11,4 +11,3 @@ class TestReport: @pytest.mark.parametrize('case',yaml_data) def test_report(self,case): req_handler.ReqHandler.send_requests(case=case,var_class=reportData) - print(case) \ No newline at end of file diff --git a/TestCase/setting/test_01_emailIntegration.py b/TestCase/setting/test_01_emailIntegration.py index 63c914b7b0bdfc0d7f37352552ac8e8032137009..6c2fc9a27457ea844cf13bd4feeae200e7620df9 100644 --- a/TestCase/setting/test_01_emailIntegration.py +++ b/TestCase/setting/test_01_emailIntegration.py @@ -11,5 +11,4 @@ class TestEmailIntegration: @pytest.mark.flaky(reruns=emailIntegrationData.rerun, reruns_delay=emailIntegrationData.rerun_delay) @pytest.mark.parametrize('case',yaml_data) def test_emailIntegration(self,case): - print(case) req_handler.ReqHandler.send_requests(case=case,var_class=emailIntegrationData) diff --git a/TestCase/setting/test_02_whatsappIntegration.py b/TestCase/setting/test_02_whatsappIntegration.py index 1a9ce5e25d63ce44207c97c4588ddab985ea9272..779655497538986e0d41bb8654442caf5ea0f577 100644 --- a/TestCase/setting/test_02_whatsappIntegration.py +++ b/TestCase/setting/test_02_whatsappIntegration.py @@ -10,5 +10,4 @@ class TestWhatsappIntegration: @pytest.mark.flaky(reruns=whatsappIntegrationData.rerun, reruns_delay=whatsappIntegrationData.rerun_delay) @pytest.mark.parametrize('case',yaml_data) def test_whatsappIntegration(self,case): - print(case) req_handler.ReqHandler.send_requests(case=case,var_class=whatsappIntegrationData) diff --git a/TestCase/setting/test_04_widgetSetting.py b/TestCase/setting/test_04_widgetSetting.py index ff50d85d85968835b761a9348f84f87fcef09281..76c87573630c7979837980f48956f2f1dac61afb 100644 --- a/TestCase/setting/test_04_widgetSetting.py +++ b/TestCase/setting/test_04_widgetSetting.py @@ -10,5 +10,4 @@ class TestWidgetSetting: @pytest.mark.flaky(reruns=widgetSettingData.rerun, reruns_delay=widgetSettingData.rerun_delay) @pytest.mark.parametrize('case',yaml_data) def test_widgetSetting(self,case): - print(case) req_handler.ReqHandler.send_requests(case=case,var_class=widgetSettingData) diff --git a/TestData/setting/email_integration_test_data.py b/TestData/setting/email_integration_test_data.py index e4bf3e707f852f4fe8a2c8138ae940cd7cbe039b..0725b7e31ad51f374b81608e97883df20690b7bd 100644 --- a/TestData/setting/email_integration_test_data.py +++ b/TestData/setting/email_integration_test_data.py @@ -1,7 +1,8 @@ from Utils.global_variate import Global +from Utils.mockData_handler import data_handler class emailIntegrationData(Global): - append_email_address = 'autotest@channelwill.cn' + append_email_address = f'{data_handler.name()}@channelwill.cn' append_email_name = 'autotest' append_email_status = 0 new_email_name = 'autotest2' diff --git a/Utils/req_handler.py b/Utils/req_handler.py index ac37046b454ebb5c64834caa05df906bbcca28a4..f7a2949548e6b4854139cf37018dd7f525421dd7 100644 --- a/Utils/req_handler.py +++ b/Utils/req_handler.py @@ -104,11 +104,13 @@ class ReqHandler: raise TypeError('用例格式有误') except AssertionError: logger.error(f'{title}用例执行失败，失败原因：断言不通过\n用例{case}\n期望值{expected}\n实际返回值{res.text}') + print(f'{title}用例执行失败，失败原因：断言不通过\n用例{case}\n期望值{expected}\n实际返回值{res.text}') raise AssertionError except Exception as e: import traceback print(traceback.print_exc()) logger.error(f'{title}用例执行失败，失败原因：{e}') + print(f'{title}用例执行失败，失败原因：{e}\n用例{case}') raise Exception def ws_requests(self,case): diff --git a/Utils/webhook_handler.py b/Utils/webhook_handler.py index 38272fac11ed50a0cbfa295fad3e21e7d0c30513..e426095dbbcab546fada92a571b2d26e874f54e1 100644 --- a/Utils/webhook_handler.py +++ b/Utils/webhook_handler.py @@ -9,18 +9,19 @@ import urllib.parse timestamp = str(round(time.time() * 1000)) -secret = 'SEC80ae01de9c486a9f8531d4ec1ed09b8fbd5d9cc1b0ba171b0493f9bebfeb4807' +secret = 'SEC80ae01de9c486a9f8531d4ec1ed09b8fbd5d9cc1b0ba171b0493f9bebfeb4807' #正式的webhook +# secret = 'SEC9d91939234e83369cba32c0ca4bcd9af60b5b1f69424d6fabd36f48d572a151c' #测试用的webhook secret_enc = secret.encode('utf-8') string_to_sign = '{}\n{}'.format(timestamp, secret) string_to_sign_enc = string_to_sign.encode('utf-8') hmac_code = hmac.new(secret_enc, string_to_sign_enc, digestmod=hashlib.sha256).digest() sign = urllib.parse.quote_plus(base64.b64encode(hmac_code)) - - +# webhook_url = 'https://oapi.dingtalk.com/robot/send?access_token=22fda27990b00841c3201c20649c0a8abb6da82d8472b6f6154ef4cd9dadb33f' #测试用的webhook +webhook_url = 'https://oapi.dingtalk.com/robot/send?access_token=775093d6cbe22673b65e506f20aea7036cc58c4b9e89850f660eb798e4c149f6' #正式的webhook class webhookHandler: - def __init__(self,webhookUrl = f"https://oapi.dingtalk.com/robot/send?access_token=775093d6cbe22673b65e506f20aea7036cc58c4b9e89850f660eb798e4c149f6×tamp={timestamp}&sign={sign}"): + def __init__(self,webhookUrl = f"{webhook_url}×tamp={timestamp}&sign={sign}"): self.webhookUrl = webhookUrl @@ -49,4 +50,3 @@ class webhookHandler: res = requests.post(url=self.webhookUrl,data=data) webhook = webhookHandler() -webhook.getToken() \ No newline at end of file