修改python脚本

8e48a5e8 · zhangjingdong · 3433519a · 8e48a5e8 · 8e48a5e8 · 8e48a5e8
Commit 8e48a5e8 authored Nov 30, 2018 by zhangjingdong
Hide whitespace changes
Inline Side-by-side

Showing with 57 additions and 47 deletions

.DS_Store
+0 -0

.idea/workspace.xml
+36 -34

碧合app/.DS_Store
+0 -0

碧合app/execute_automation_scripts.py
+21 -13

No files found.
--- a/.DS_Store
+++ b/.DS_Store
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,6 +2,7 @@
 <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" />
@@ -12,15 +13,15 @@
    <option name="LAST_RESOLUTION" value="IGNORE" />
  </component>
  <component name="CoverageDataManager">
-    <SUITE FILE_PATH="coverage/bihe_interface_test$execute_automation_scripts.coverage" NAME="execute_automation_scripts Coverage Results" MODIFIED="1543388974183" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/碧合app" />
+    <SUITE FILE_PATH="coverage/bihe_interface_test$execute_automation_scripts.coverage" NAME="execute_automation_scripts Coverage Results" MODIFIED="1543485370707" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/碧合app" />
  </component>
  <component name="FileEditorManager">
    <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
      <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="416">
+            <state relative-caret-position="252">
-              <caret line="35" column="23" selection-start-line="35" selection-start-column="23" selection-end-line="35" selection-end-column="23" />
+              <caret line="14" column="38" lean-forward="true" selection-start-line="14" selection-start-column="38" selection-end-line="14" selection-end-column="38" />
              <folding>
                <element signature="e#18#29#0" expanded="true" />
              </folding>
@@ -80,6 +81,7 @@
      <foldersAlwaysOnTop value="true" />
    </navigator>
    <panes>
+      <pane id="Scope" />
      <pane id="ProjectPane">
        <subPane>
          <expand>
@@ -100,7 +102,6 @@
          <select />
        </subPane>
      </pane>
-      <pane id="Scope" />
    </panes>
  </component>
  <component name="PropertiesComponent">
@@ -167,25 +168,25 @@
      <window_info anchor="bottom" id="TODO" order="6" />
      <window_info anchor="bottom" id="Event Log" order="7" side_tool="true" />
      <window_info anchor="bottom" id="Database Changes" order="7" show_stripe_button="false" />
-      <window_info active="true" anchor="bottom" id="Run" order="2" visible="true" weight="0.32969698" />
      <window_info anchor="bottom" id="Version Control" order="7" />
      <window_info anchor="bottom" id="Python Console" order="7" />
+      <window_info active="true" anchor="bottom" id="Run" order="2" visible="true" weight="0.32969698" />
      <window_info anchor="bottom" id="Terminal" order="7" weight="0.32969698" />
-      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.2532189" />
+      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.25679544" />
      <window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" />
      <window_info anchor="right" id="Database" order="3" />
-      <window_info anchor="bottom" id="Find" order="1" weight="0.32969698" />
      <window_info anchor="right" id="SciView" order="3" />
      <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
-      <window_info anchor="bottom" id="Concurrent Activities Diagram" weight="0.32969698" />
-      <window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
      <window_info id="Favorites" order="2" side_tool="true" />
+      <window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
      <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
      <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
      <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
      <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
      <window_info anchor="bottom" id="Message" order="0" />
      <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
+      <window_info anchor="bottom" id="Find" order="1" weight="0.32969698" />
+      <window_info anchor="bottom" id="Concurrent Activities Diagram" order="8" weight="0.32969698" />
    </layout>
  </component>
  <component name="TypeScriptGeneratedFilesManager">
@@ -206,7 +207,17 @@
    </breakpoint-manager>
  </component>
  <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/htmlOut.html">
+    <entry file="file://$PROJECT_DIR$/碧合app/execute_automation_scripts.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="234">
+          <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#18#29#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/README.md">
      <provider selected="true" editor-type-id="text-editor" />
    </entry>
    <entry file="file://$PROJECT_DIR$/碧合app/活动/活动.postman_collection.json">
@@ -215,6 +226,13 @@
    <entry file="file://$PROJECT_DIR$/碧合app/活动/-活动_manage.postman_environment.json">
      <provider selected="true" editor-type-id="text-editor" />
    </entry>
+    <entry file="file://$PROJECT_DIR$/htmlOut.html" />
+    <entry file="file://$PROJECT_DIR$/碧合app/活动/活动.postman_collection.json">
+      <provider selected="true" editor-type-id="text-editor" />
+    </entry>
+    <entry file="file://$PROJECT_DIR$/碧合app/活动/-活动_manage.postman_environment.json">
+      <provider selected="true" editor-type-id="text-editor" />
+    </entry>
    <entry file="file://$PROJECT_DIR$/碧合app/execute_automation_scripts.py">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="144">
@@ -225,9 +243,7 @@
        </state>
      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/htmlOut.html">
+    <entry file="file://$PROJECT_DIR$/htmlOut.html" />
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
    <entry file="file://$PROJECT_DIR$/碧合app/活动/-活动_manage.postman_environment.json">
      <provider selected="true" editor-type-id="text-editor" />
    </entry>
@@ -237,29 +253,15 @@
    <entry file="file://$PROJECT_DIR$/碧合app/活动/活动.postman_collection.json">
      <provider selected="true" editor-type-id="text-editor" />
    </entry>
-    <entry file="file://$PROJECT_DIR$/碧合app/htmlOut.html">
+    <entry file="file://$PROJECT_DIR$/碧合app/htmlOut.html" />
-      <provider selected="true" editor-type-id="text-editor">
+    <entry file="file://$PROJECT_DIR$/碧合app/活动2018-11-27" />
-        <state relative-caret-position="-229" />
+    <entry file="file://$PROJECT_DIR$/碧合app/.html.html" />
-      </provider>
+    <entry file="file://$PROJECT_DIR$/碧合app/活动2018-11-27_20:00:34.html" />
-    </entry>
+    <entry file="file://$PROJECT_DIR$/碧合app/活动2018-11-28_09:34:00.html" />
-    <entry file="file://$PROJECT_DIR$/碧合app/活动2018-11-27">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/碧合app/.html.html">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/碧合app/活动2018-11-27_20:00:34.html">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-56833" />
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/碧合app/活动2018-11-28_09:34:00.html">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
    <entry file="file://$PROJECT_DIR$/碧合app/execute_automation_scripts.py">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="416">
+        <state relative-caret-position="252">
-          <caret line="35" column="23" selection-start-line="35" selection-start-column="23" selection-end-line="35" selection-end-column="23" />
+          <caret line="14" column="38" lean-forward="true" selection-start-line="14" selection-start-column="38" selection-end-line="14" selection-end-column="38" />
          <folding>
            <element signature="e#18#29#0" expanded="true" />
          </folding>

--- a/碧合app/.DS_Store
+++ b/碧合app/.DS_Store
--- a/碧合app/execute_automation_scripts.py
+++ b/碧合app/execute_automation_scripts.py
 # coding = utf-8
@@ -2,7 +2,6 @@
 import time
 import os
-import datetime
 class PostmanApi:
@@ -18,19 +17,29 @@ class PostmanApi:
            if os.path.isdir(p):
                file.append(p)
        for file_path in file:
-            now_time = file_path + time.strftime("%Y-%m-%d_%H:%M:%S", time.localtime(time.time())) + '.html'
+            now_date = report_file + time.strftime("%Y-%m-%d", time.localtime(time.time()))
-            report_file_path = report_file + file_path
+            now_module = now_date + "/" + file_path
-            if (os.path.exists(report_file_path)):
+            now_time = now_date + "/" + file_path + "/" + time.strftime("%H%M%S", time.localtime(
-                execute = "newman run " + BASE_DIR + "/" + file_path + "/" + file_path + ".postman_collection.json -e " + BASE_DIR + "/" + file_path + "/-" + file_path + "_manage.postman_environment.json --delay-request 500 --timeout-request 5000 --reporters html --reporter-html-export " + report_file_path + "/" + now_time
+                time.time())) + "_" + file_path + '.html'
-                os.system(execute)
+            if (os.path.exists(now_date)):
+                if (os.path.exists(now_module)):
+                    execute = "newman run " + BASE_DIR + "/" + file_path + "/" + file_path + ".postman_collection.json -e " + BASE_DIR + "/" + file_path + "/-" + file_path + "_manage.postman_environment.json --delay-request 500 --timeout-request 5000 --reporters html --reporter-html-export " + now_time
+                    os.system(execute)
+                else:
+                    os.system("mkdir " + now_module)
+                    execute = "newman run " + BASE_DIR + "/" + file_path + "/" + file_path + ".postman_collection.json -e " + BASE_DIR + "/" + file_path + "/-" + file_path + "_manage.postman_environment.json --delay-request 500 --timeout-request 5000 --reporters html --reporter-html-export " + now_time
+                    os.system(execute)
            else:
-                os.system("mkdir "+ report_file_path)
+                os.system("mkdir " + now_date)
-                execute = "newman run " + BASE_DIR + "/" + file_path + "/" + file_path + ".postman_collection.json -e " + BASE_DIR + "/" + file_path + "/-" + file_path + "_manage.postman_environment.json --delay-request 500 --timeout-request 5000 --reporters html --reporter-html-export " + report_file_path + "/" + now_time
+                if (os.path.exists(now_module)):
-                os.system(execute)
+                    execute = "newman run " + BASE_DIR + "/" + file_path + "/" + file_path + ".postman_collection.json -e " + BASE_DIR + "/" + file_path + "/-" + file_path + "_manage.postman_environment.json --delay-request 500 --timeout-request 5000 --reporters html --reporter-html-export " + now_time
+                    os.system(execute)
+                else:
+                    os.system("mkdir " + now_module)
+                    execute = "newman run " + BASE_DIR + "/" + file_path + "/" + file_path + ".postman_collection.json -e " + BASE_DIR + "/" + file_path + "/-" + file_path + "_manage.postman_environment.json --delay-request 500 --timeout-request 5000 --reporters html --reporter-html-export " + now_time
+                    os.system(execute)
        return self
 if __name__ == '__main__':
    PostmanApi().post()
-if __name__ == '__main__':
-    PostmanApi().post()
\ No newline at end of file