Commit 7bdb235f by zhangjingdong

修改了文件格式+时间格式

parent 21a6702a
......@@ -2,7 +2,6 @@
<project version="4">
<component name="ChangeListManager">
<list default="true" id="243b24f3-3df7-4c72-bf73-8de81d5ca458" name="Default" comment="">
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/碧合app/execute_automation_scripts.py" beforeDir="false" afterPath="$PROJECT_DIR$/碧合app/execute_automation_scripts.py" afterDir="false" />
</list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
......@@ -24,11 +23,11 @@
<file leaf-file-name="execute_automation_scripts.py" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/碧合app/execute_automation_scripts.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="293">
<caret line="66" column="58" lean-forward="true" selection-start-line="66" selection-start-column="58" selection-end-line="66" selection-end-column="58" />
<state relative-caret-position="265">
<caret line="53" column="47" lean-forward="true" selection-start-line="53" selection-start-column="47" selection-end-line="53" selection-end-column="47" />
<folding>
<element signature="e#19#30#0" expanded="true" />
<marker date="1547434007430" expanded="true" signature="2739:3713" ph="..." />
<marker date="1547434080275" expanded="true" signature="2740:3714" ph="..." />
</folding>
</state>
</provider>
......@@ -370,7 +369,7 @@
<caret line="10" column="49" lean-forward="true" selection-start-line="10" selection-start-column="49" selection-end-line="10" selection-end-column="49" />
<folding>
<element signature="e#19#30#0" expanded="true" />
<marker date="1547434007430" expanded="true" signature="2739:3713" ph="..." />
<marker date="1547434080275" expanded="true" signature="2740:3714" ph="..." />
</folding>
</state>
</provider>
......@@ -423,7 +422,7 @@
<caret line="11" column="49" lean-forward="true" selection-start-line="11" selection-start-column="49" selection-end-line="11" selection-end-column="49" />
<folding>
<element signature="e#19#30#0" expanded="true" />
<marker date="1547434007430" expanded="true" signature="2739:3713" ph="..." />
<marker date="1547434080275" expanded="true" signature="2740:3714" ph="..." />
</folding>
</state>
</provider>
......@@ -440,7 +439,7 @@
<caret line="15" column="32" lean-forward="true" selection-start-line="15" selection-start-column="32" selection-end-line="15" selection-end-column="32" />
<folding>
<element signature="e#19#30#0" expanded="true" />
<marker date="1547434007430" expanded="true" signature="2739:3713" ph="..." />
<marker date="1547434080275" expanded="true" signature="2740:3714" ph="..." />
</folding>
</state>
</provider>
......@@ -458,7 +457,7 @@
<caret line="14" column="25" selection-start-line="14" selection-start-column="25" selection-end-line="14" selection-end-column="25" />
<folding>
<element signature="e#19#30#0" expanded="true" />
<marker date="1547434007430" expanded="true" signature="2739:3713" ph="..." />
<marker date="1547434080275" expanded="true" signature="2740:3714" ph="..." />
</folding>
</state>
</provider>
......@@ -481,7 +480,7 @@
<caret line="8" column="8" lean-forward="true" selection-start-line="8" selection-start-column="8" selection-end-line="8" selection-end-column="8" />
<folding>
<element signature="e#19#30#0" expanded="true" />
<marker date="1547434007430" expanded="true" signature="2739:3713" ph="..." />
<marker date="1547434080275" expanded="true" signature="2740:3714" ph="..." />
</folding>
</state>
</provider>
......@@ -590,11 +589,11 @@
</entry>
<entry file="file://$PROJECT_DIR$/碧合app/execute_automation_scripts.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="293">
<caret line="66" column="58" lean-forward="true" selection-start-line="66" selection-start-column="58" selection-end-line="66" selection-end-column="58" />
<state relative-caret-position="265">
<caret line="53" column="47" lean-forward="true" selection-start-line="53" selection-start-column="47" selection-end-line="53" selection-end-column="47" />
<folding>
<element signature="e#19#30#0" expanded="true" />
<marker date="1547434007430" expanded="true" signature="2739:3713" ph="..." />
<marker date="1547434080275" expanded="true" signature="2740:3714" ph="..." />
</folding>
</state>
</provider>
......
# coding = utf-8
# coding = utf-8
......@@ -44,7 +44,7 @@ class PostmanApi():
message = MIMEText('各位领导同事:\n 以下是本次接口自动化测试的执行结果\n'
+report_text+"\n"+report_text1+"\n 报告执行具体情况可通过下面链接查看\n"
" 报告地址:"+"http://reptorfile.bgycc.com/"+years+"/"+at_the,'plain', 'utf-8')
" 报告地址:"+"http://reptorfile.bgycc.com/"+years+"/"+ at_the,'plain', 'utf-8')
message['From'] =Header("测试环境接口自动化测试")
message['Subject'] = Header(years+at_the+"自动化测试结果",'utf-8')
......@@ -67,7 +67,7 @@ class PostmanApi():
# report_file = "/Users/lucas/Documents/reporter/"
BASE_DIR = os.path.realpath(os.path.dirname(os.path.abspath(__file__)))
path = os.listdir(BASE_DIR)
at_the = time.strftime("%H-%M", time.localtime(time.time()))
at_the = time.strftime("%H:%M", time.localtime(time.time()))
years = time.strftime("%Y-%m-%d", time.localtime(time.time()))
extract_data = report_file+years+"/"+at_the
# extract_data = "/Users/lucas/Documents/reporter/2019-01-08/14-55"
......
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