Merge branch 'master' into 'develop'

修改脚本



See merge request !1

.idea/workspace.xml

@@ -19,8 +19,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="350">
-              <caret line="26" column="56" lean-forward="true" selection-start-line="26" selection-start-column="56" selection-end-line="26" selection-end-column="56" />
+            <state relative-caret-position="-124">
+              <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>
               <folding>
                 <element signature="e#18#29#0" expanded="true" />
                 <element signature="e#18#29#0" expanded="true" />
               </folding>
               </folding>
@@ -259,8 +259,8 @@
     <entry file="file://$PROJECT_DIR$/碧合app/活动2018-11-28_09:34:00.html" />
     <entry file="file://$PROJECT_DIR$/碧合app/活动2018-11-28_09:34:00.html" />
     <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="350">
-          <caret line="26" column="56" lean-forward="true" selection-start-line="26" selection-start-column="56" selection-end-line="26" selection-end-column="56" />
+        <state relative-caret-position="-124">
+          <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>
           <folding>
             <element signature="e#18#29#0" expanded="true" />
             <element signature="e#18#29#0" expanded="true" />
           </folding>
           </folding>

碧合app/execute_automation_scripts.py

-# coding = utf-8
+# coding = utf-8
@@ -9,9 +9,7 @@ class PostmanApi:
     def post(self):
     def post(self):
         file = []
         file = []
         report_file = "/phantom/file/testreport"
         report_file = "/phantom/file/testreport"
-        # 获取当前文件路径
         BASE_DIR = os.path.realpath(os.path.dirname(os.path.abspath(__file__)))
         BASE_DIR = os.path.realpath(os.path.dirname(os.path.abspath(__file__)))
-        # 获取当前路径所有文件
         path = os.listdir(BASE_DIR)
         path = os.listdir(BASE_DIR)
         # print( path)
         # print( path)
         for p in path:
         for p in path: