Commit 3b768ba6 by zhangjingdong

修改邮件发送规则

parent 86263e08
No preview for this file type
...@@ -24,8 +24,8 @@ ...@@ -24,8 +24,8 @@
<file leaf-file-name="execute_automation_scripts.py" pinned="false" current-in-tab="true"> <file leaf-file-name="execute_automation_scripts.py" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/碧合app/execute_automation_scripts.py"> <entry file="file://$PROJECT_DIR$/碧合app/execute_automation_scripts.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="244"> <state relative-caret-position="238">
<caret line="69" column="23" lean-forward="true" selection-start-line="69" selection-start-column="23" selection-end-line="69" selection-end-column="23" /> <caret line="112" column="45" lean-forward="true" selection-start-line="112" selection-start-column="45" selection-end-line="112" selection-end-column="45" />
<folding> <folding>
<element signature="e#26#37#0" expanded="true" /> <element signature="e#26#37#0" expanded="true" />
</folding> </folding>
...@@ -51,7 +51,7 @@ ...@@ -51,7 +51,7 @@
<entry file="file://$PROJECT_DIR$/碧合app/默认应用/默认应用_manage.postman_environment.json"> <entry file="file://$PROJECT_DIR$/碧合app/默认应用/默认应用_manage.postman_environment.json">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="270"> <state relative-caret-position="270">
<caret line="15" column="34" lean-forward="true" selection-start-line="15" selection-start-column="34" selection-end-line="15" selection-end-column="34" /> <caret line="15" column="34" selection-start-line="15" selection-start-column="34" selection-end-line="15" selection-end-column="34" />
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -59,7 +59,7 @@ ...@@ -59,7 +59,7 @@
<file leaf-file-name="活动.postman_collection.json" pinned="false" current-in-tab="false"> <file leaf-file-name="活动.postman_collection.json" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/碧合app/活动/活动.postman_collection.json"> <entry file="file://$PROJECT_DIR$/碧合app/活动/活动.postman_collection.json">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="389"> <state relative-caret-position="882">
<caret line="49" column="21" lean-forward="true" selection-start-line="49" selection-start-column="21" selection-end-line="49" selection-end-column="21" /> <caret line="49" column="21" lean-forward="true" selection-start-line="49" selection-start-column="21" selection-end-line="49" selection-end-column="21" />
</state> </state>
</provider> </provider>
...@@ -68,7 +68,7 @@ ...@@ -68,7 +68,7 @@
<file leaf-file-name="广场圈子.postman_collection.json" pinned="false" current-in-tab="false"> <file leaf-file-name="广场圈子.postman_collection.json" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/碧合app/广场圈子/广场圈子.postman_collection.json"> <entry file="file://$PROJECT_DIR$/碧合app/广场圈子/广场圈子.postman_collection.json">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="381"> <state relative-caret-position="972">
<caret line="54" column="51" lean-forward="true" selection-start-line="54" selection-start-column="51" selection-end-line="54" selection-end-column="51" /> <caret line="54" column="51" lean-forward="true" selection-start-line="54" selection-start-column="51" selection-end-line="54" selection-end-column="51" />
</state> </state>
</provider> </provider>
...@@ -165,6 +165,7 @@ ...@@ -165,6 +165,7 @@
<foldersAlwaysOnTop value="true" /> <foldersAlwaysOnTop value="true" />
</navigator> </navigator>
<panes> <panes>
<pane id="Scope" />
<pane id="ProjectPane"> <pane id="ProjectPane">
<subPane> <subPane>
<expand> <expand>
...@@ -185,7 +186,6 @@ ...@@ -185,7 +186,6 @@
<select /> <select />
</subPane> </subPane>
</pane> </pane>
<pane id="Scope" />
</panes> </panes>
</component> </component>
<component name="PropertiesComponent"> <component name="PropertiesComponent">
...@@ -291,7 +291,7 @@ ...@@ -291,7 +291,7 @@
<window_info anchor="bottom" id="Python Console" order="7" weight="0.32969698" /> <window_info anchor="bottom" id="Python Console" order="7" weight="0.32969698" />
<window_info anchor="bottom" id="Run" order="2" weight="0.32969698" /> <window_info anchor="bottom" id="Run" order="2" weight="0.32969698" />
<window_info anchor="bottom" id="Terminal" order="7" weight="0.32969698" /> <window_info anchor="bottom" id="Terminal" order="7" weight="0.32969698" />
<window_info active="true" content_ui="combo" id="Project" order="0" sideWeight="0.5334539" visible="true" weight="0.2932761" /> <window_info active="true" content_ui="combo" id="Project" order="0" sideWeight="0.5334539" visible="true" weight="0.29756796" />
<window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" /> <window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" />
<window_info anchor="right" id="Database" order="3" /> <window_info anchor="right" id="Database" order="3" />
<window_info anchor="right" id="SciView" order="3" /> <window_info anchor="right" id="SciView" order="3" />
...@@ -546,7 +546,7 @@ ...@@ -546,7 +546,7 @@
</entry> </entry>
<entry file="file://$PROJECT_DIR$/碧合app/活动/活动.postman_collection.json"> <entry file="file://$PROJECT_DIR$/碧合app/活动/活动.postman_collection.json">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="389"> <state relative-caret-position="882">
<caret line="49" column="21" lean-forward="true" selection-start-line="49" selection-start-column="21" selection-end-line="49" selection-end-column="21" /> <caret line="49" column="21" lean-forward="true" selection-start-line="49" selection-start-column="21" selection-end-line="49" selection-end-column="21" />
</state> </state>
</provider> </provider>
...@@ -564,13 +564,13 @@ ...@@ -564,13 +564,13 @@
<entry file="file://$PROJECT_DIR$/碧合app/默认应用/默认应用_manage.postman_environment.json"> <entry file="file://$PROJECT_DIR$/碧合app/默认应用/默认应用_manage.postman_environment.json">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="270"> <state relative-caret-position="270">
<caret line="15" column="34" lean-forward="true" selection-start-line="15" selection-start-column="34" selection-end-line="15" selection-end-column="34" /> <caret line="15" column="34" selection-start-line="15" selection-start-column="34" selection-end-line="15" selection-end-column="34" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/碧合app/广场圈子/广场圈子.postman_collection.json"> <entry file="file://$PROJECT_DIR$/碧合app/广场圈子/广场圈子.postman_collection.json">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="381"> <state relative-caret-position="972">
<caret line="54" column="51" lean-forward="true" selection-start-line="54" selection-start-column="51" selection-end-line="54" selection-end-column="51" /> <caret line="54" column="51" lean-forward="true" selection-start-line="54" selection-start-column="51" selection-end-line="54" selection-end-column="51" />
</state> </state>
</provider> </provider>
...@@ -584,8 +584,8 @@ ...@@ -584,8 +584,8 @@
</entry> </entry>
<entry file="file://$PROJECT_DIR$/碧合app/execute_automation_scripts.py"> <entry file="file://$PROJECT_DIR$/碧合app/execute_automation_scripts.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="244"> <state relative-caret-position="238">
<caret line="69" column="23" lean-forward="true" selection-start-line="69" selection-start-column="23" selection-end-line="69" selection-end-column="23" /> <caret line="112" column="45" lean-forward="true" selection-start-line="112" selection-start-column="45" selection-end-line="112" selection-end-column="45" />
<folding> <folding>
<element signature="e#26#37#0" expanded="true" /> <element signature="e#26#37#0" expanded="true" />
</folding> </folding>
......
No preview for this file type
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
...@@ -125,7 +125,10 @@ class PostmanApi(): ...@@ -125,7 +125,10 @@ class PostmanApi():
report = "" report = ""
report_text+=report.join(u" 模块:"+item[:-5]+u" 数量:"+li1+u" 失败:"+li2+"\n") report_text+=report.join(u" 模块:"+item[:-5]+u" 数量:"+li1+u" 失败:"+li2+"\n")
report_text1 = u" 接口数量:"+str(successful)+u" 失败数量:"+str(failure) report_text1 = u" 接口数量:"+str(successful)+u" 失败数量:"+str(failure)
PostmanApi().report_mail(years,report_text1,report_text,at_the,report_file) if(failure != 0):
PostmanApi().report_mail(years,report_text1,report_text,at_the,report_file)
else:
print("全部成功")
return self return self
......
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 sign in to comment