From 8c2677bb547bc212e8fe0eaa64c1c41b711f0de6 Mon Sep 17 00:00:00 2001 From: zhaihuitao <zhaihuitao@reyun.com> Date: Mon, 9 Nov 2020 14:26:11 +0800 Subject: [PATCH] update --- .idea/workspace.xml | 163 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------------------------------------------------------------------------------- report/result.html | 34 +++++++++++++++++----------------- testcase/run_all_cases.py | 14 ++++++++++++-- 3 files changed, 107 insertions(+), 104 deletions(-) diff --git a/.idea/workspace.xml b/.idea/workspace.xml index a9f9d0e..cf76525 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -3,6 +3,7 @@ <component name="ChangeListManager"> <list default="true" id="d0064643-2990-4ed3-bfb0-875849b30f4e" name="Default" comment=""> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/report/result.html" afterPath="$PROJECT_DIR$/report/result.html" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/testcase/run_all_cases.py" afterPath="$PROJECT_DIR$/testcase/run_all_cases.py" /> </list> <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> @@ -13,7 +14,7 @@ <option name="LAST_RESOLUTION" value="IGNORE" /> </component> <component name="CoverageDataManager"> - <SUITE FILE_PATH="coverage/interfaceTest$run_all_cases.coverage" NAME="run_all_cases Coverage Results" MODIFIED="1604460416236" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/testcase" /> + <SUITE FILE_PATH="coverage/interfaceTest$run_all_cases.coverage" NAME="run_all_cases Coverage Results" MODIFIED="1604902207750" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/testcase" /> <SUITE FILE_PATH="coverage/interfaceTest$Nosetests_for_test_click_clickTestCase_testclick.coverage" NAME="Nosetests for test_click.clickTestCase.testclick Coverage Results" MODIFIED="1603353013821" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/testcase/android_click" /> <SUITE FILE_PATH="coverage/interfaceTest$params.coverage" NAME="params Coverage Results" MODIFIED="1597980084524" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/config/prod" /> <SUITE FILE_PATH="coverage/interfaceTest$Nosetests_in_test_batchUpload_py.coverage" NAME="Nosetests in test_batchUpload.py Coverage Results" MODIFIED="1601196142097" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/testcase/android_events" /> @@ -110,33 +111,21 @@ </provider> </entry> </file> - <file leaf-file-name="test_login.py" pinned="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/testcase/android_events/test_login.py"> - <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="135"> - <caret line="9" column="13" lean-forward="false" selection-start-line="9" selection-start-column="13" selection-end-line="9" selection-end-column="13" /> - <folding /> - </state> - </provider> - </entry> - </file> <file leaf-file-name="result.html" pinned="false" current-in-tab="false"> <entry file="file://$PROJECT_DIR$/report/result.html"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="30"> - <caret line="2" column="43" lean-forward="true" selection-start-line="2" selection-start-column="43" selection-end-line="2" selection-end-column="43" /> + <state relative-caret-position="0"> + <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> <folding> <element signature="e#211#215#0" expanded="true" /> <element signature="e#225#229#0" expanded="true" /> <element signature="n#style#0;n#h1#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> <element signature="e#3653#3657#0" expanded="true" /> <element signature="e#3667#3671#0" expanded="true" /> - <element signature="n#style#0;n#tr#0;n#table#0;n#body#0;n#html#0;n#!!top" expanded="true" /> - <element signature="e#5687#5691#0" expanded="true" /> - <element signature="e#5705#5709#0" expanded="true" /> - <marker date="1604891261903" expanded="false" signature="18943:18949" ph=" " /> - <marker date="1604891261903" expanded="false" signature="18972:19051" ph="..." /> - <marker date="1604891261903" expanded="false" signature="19119:19134" ph="..." /> + <element signature="e#19069#19075#1" expanded="true" /> + <element signature="n#style#0;n#div#2;n#body#0;n#html#0;n#!!top" expanded="true" /> + <marker date="1604902937247" expanded="true" signature="19245:19260" ph="..." /> + <marker date="1604902937247" expanded="true" signature="19280:19292" ph="..." /> </folding> </state> </provider> @@ -155,8 +144,8 @@ <file leaf-file-name="run_all_cases.py" pinned="false" current-in-tab="true"> <entry file="file://$PROJECT_DIR$/testcase/run_all_cases.py"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="420"> - <caret line="28" column="27" lean-forward="false" selection-start-line="28" selection-start-column="27" selection-end-line="28" selection-end-column="27" /> + <state relative-caret-position="225"> + <caret line="15" column="25" lean-forward="false" selection-start-line="15" selection-start-column="25" selection-end-line="15" selection-end-column="25" /> <folding> <element signature="e#105#120#0" expanded="true" /> </folding> @@ -164,16 +153,6 @@ </provider> </entry> </file> - <file leaf-file-name="baseEvent.py" pinned="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/testcase/android_events/baseEvent.py"> - <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="2753"> - <caret line="487" column="13" lean-forward="false" selection-start-line="487" selection-start-column="13" selection-end-line="487" selection-end-column="13" /> - <folding /> - </state> - </provider> - </entry> - </file> <file leaf-file-name="HTMLTestReportCN.py" pinned="false" current-in-tab="false"> <entry file="file://$PROJECT_DIR$/report/HTMLTestReportCN.py"> <provider selected="true" editor-type-id="text-editor"> @@ -342,6 +321,20 @@ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> </PATH> + <PATH> + <PATH_ELEMENT> + <option name="myItemId" value="interfaceTest" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="interfaceTest" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="report" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + </PATH> </subPane> </pane> </panes> @@ -653,13 +646,6 @@ <updated>1596505503233</updated> <workItem from="1596786333197" duration="228000" /> </task> - <task id="LOCAL-00019" summary="add install enevt"> - <created>1597653686002</created> - <option name="number" value="00019" /> - <option name="presentableId" value="LOCAL-00019" /> - <option name="project" value="LOCAL" /> - <updated>1597653686002</updated> - </task> <task id="LOCAL-00020" summary="add install enevt"> <created>1597653726001</created> <option name="number" value="00020" /> @@ -996,7 +982,14 @@ <option name="project" value="LOCAL" /> <updated>1604891483336</updated> </task> - <option name="localTasksCounter" value="68" /> + <task id="LOCAL-00068" summary="update"> + <created>1604892322000</created> + <option name="number" value="00068" /> + <option name="presentableId" value="LOCAL-00068" /> + <option name="project" value="LOCAL" /> + <updated>1604892322000</updated> + </task> + <option name="localTasksCounter" value="69" /> <servers /> </component> <component name="TestHistory"> @@ -1110,20 +1103,6 @@ <watches-manager /> </component> <component name="editorHistoryManager"> - <entry file="file://$PROJECT_DIR$/data/prod.yaml"> - <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="225"> - <caret line="15" column="31" lean-forward="false" selection-start-line="15" selection-start-column="31" selection-end-line="15" selection-end-column="31" /> - </state> - </provider> - </entry> - <entry file="file:///anaconda3/lib/python3.6/site-packages/xlwings/constants.py"> - <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="72"> - <caret line="376" column="6" lean-forward="false" selection-start-line="376" selection-start-column="6" selection-end-line="376" selection-end-column="6" /> - </state> - </provider> - </entry> <entry file="file:///anaconda3/lib/python3.6/site-packages/imageio/plugins/_swf.py"> <provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="978"> @@ -1393,26 +1372,6 @@ </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/report/result.html"> - <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="30"> - <caret line="2" column="43" lean-forward="true" selection-start-line="2" selection-start-column="43" selection-end-line="2" selection-end-column="43" /> - <folding> - <element signature="e#211#215#0" expanded="true" /> - <element signature="e#225#229#0" expanded="true" /> - <element signature="n#style#0;n#h1#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> - <element signature="e#3653#3657#0" expanded="true" /> - <element signature="e#3667#3671#0" expanded="true" /> - <element signature="n#style#0;n#tr#0;n#table#0;n#body#0;n#html#0;n#!!top" expanded="true" /> - <element signature="e#5687#5691#0" expanded="true" /> - <element signature="e#5705#5709#0" expanded="true" /> - <marker date="1604891261903" expanded="false" signature="18943:18949" ph=" " /> - <marker date="1604891261903" expanded="false" signature="18972:19051" ph="..." /> - <marker date="1604891261903" expanded="false" signature="19119:19134" ph="..." /> - </folding> - </state> - </provider> - </entry> <entry file="file:///anaconda3/lib/python3.6/site-packages/HTMLTestReportCN.py"> <provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="45"> @@ -1453,14 +1412,6 @@ </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/testcase/android_events/baseEvent.py"> - <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="2753"> - <caret line="487" column="13" lean-forward="false" selection-start-line="487" selection-start-column="13" selection-end-line="487" selection-end-column="13" /> - <folding /> - </state> - </provider> - </entry> <entry file="file:///anaconda3/lib/python3.6/json/__init__.py"> <provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="0"> @@ -1485,18 +1436,60 @@ </state> </provider> </entry> + <entry file="file://$PROJECT_DIR$/report/result.html"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="0"> + <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> + <folding> + <element signature="e#211#215#0" expanded="true" /> + <element signature="e#225#229#0" expanded="true" /> + <element signature="n#style#0;n#h1#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> + <element signature="e#3653#3657#0" expanded="true" /> + <element signature="e#3667#3671#0" expanded="true" /> + <element signature="e#19069#19075#1" expanded="true" /> + <element signature="n#style#0;n#div#2;n#body#0;n#html#0;n#!!top" expanded="true" /> + <marker date="1604902937247" expanded="true" signature="19245:19260" ph="..." /> + <marker date="1604902937247" expanded="true" signature="19280:19292" ph="..." /> + </folding> + </state> + </provider> + </entry> + <entry file="file:///anaconda3/lib/python3.6/ntpath.py"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="-83"> + <caret line="239" column="4" lean-forward="false" selection-start-line="239" selection-start-column="4" selection-end-line="239" selection-end-column="4" /> + <folding /> + </state> + </provider> + </entry> <entry file="file://$PROJECT_DIR$/HTMLTestReportCN.py"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="158"> - <caret line="20" column="24" lean-forward="false" selection-start-line="20" selection-start-column="18" selection-end-line="20" selection-end-column="24" /> + <state relative-caret-position="1004"> + <caret line="548" column="8" lean-forward="false" selection-start-line="548" selection-start-column="8" selection-end-line="548" selection-end-column="8" /> + <folding /> + </state> + </provider> + </entry> + <entry file="file:///anaconda3/lib/python3.6/unittest/runner.py"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="2550"> + <caret line="175" column="0" lean-forward="false" selection-start-line="175" selection-start-column="0" selection-end-line="175" selection-end-column="0" /> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/testcase/android_events/baseEvent.py"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="2753"> + <caret line="487" column="13" lean-forward="false" selection-start-line="487" selection-start-column="13" selection-end-line="487" selection-end-column="13" /> <folding /> </state> </provider> </entry> <entry file="file://$PROJECT_DIR$/testcase/run_all_cases.py"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="420"> - <caret line="28" column="27" lean-forward="false" selection-start-line="28" selection-start-column="27" selection-end-line="28" selection-end-column="27" /> + <state relative-caret-position="225"> + <caret line="15" column="25" lean-forward="false" selection-start-line="15" selection-start-column="25" selection-end-line="15" selection-end-column="25" /> <folding> <element signature="e#105#120#0" expanded="true" /> </folding> diff --git a/report/result.html b/report/result.html index c935ee9..04b41e2 100644 --- a/report/result.html +++ b/report/result.html @@ -123,8 +123,8 @@ function html_escape(s) { <div class='heading'> <h1 style="font-family: Microsoft YaHei"><TKIO接口监控报告></h1> <p class='attribute'><strong>测试人员 : </strong> 翟会涛</p> -<p class='attribute'><strong>开始时间 : </strong> 2020-11-09 11:07:36</p> -<p class='attribute'><strong>合计耗时 : </strong> 0:00:05.010026</p> +<p class='attribute'><strong>开始时间 : </strong> 2020-11-09 14:22:13</p> +<p class='attribute'><strong>合计耗时 : </strong> 0:00:03.505581</p> <p class='attribute'><strong>测试结果 : </strong> 共 14,通过 14,通过率= 100.00%</p> <p class='description'>TKIO接口自动化测试用例</p> @@ -157,7 +157,7 @@ function html_escape(s) { </tr> <tr class='passClass warning'> - <td>android_click.test_click.clickTestCase</td> + <td>testcase.android_click.test_click.clickTestCase</td> <td class="text-center">1</td> <td class="text-center">1</td> <td class="text-center">0</td> @@ -188,7 +188,7 @@ pt1_1: 执行结果: </tr> <tr class='passClass warning'> - <td>android_events.test_adclick.adclickTestCase</td> + <td>testcase.android_events.test_adclick.adclickTestCase</td> <td class="text-center">1</td> <td class="text-center">1</td> <td class="text-center">0</td> @@ -217,7 +217,7 @@ pt2_1: 广告点击:{"status":0} </tr> <tr class='passClass warning'> - <td>android_events.test_adshow.adshowTestCase</td> + <td>testcase.android_events.test_adshow.adshowTestCase</td> <td class="text-center">1</td> <td class="text-center">1</td> <td class="text-center">0</td> @@ -247,7 +247,7 @@ pt3_1: </tr> <tr class='passClass warning'> - <td>android_events.test_appduration.appdurationTestCase</td> + <td>testcase.android_events.test_appduration.appdurationTestCase</td> <td class="text-center">1</td> <td class="text-center">1</td> <td class="text-center">0</td> @@ -276,7 +276,7 @@ pt4_1: App使用时长:{"status":0} </tr> <tr class='passClass warning'> - <td>android_events.test_batchUpload.batchUploadTestCase</td> + <td>testcase.android_events.test_batchUpload.batchUploadTestCase</td> <td class="text-center">1</td> <td class="text-center">1</td> <td class="text-center">0</td> @@ -305,7 +305,7 @@ pt5_1: 自定义 </tr> <tr class='passClass warning'> - <td>android_events.test_custom.customTestCase</td> + <td>testcase.android_events.test_custom.customTestCase</td> <td class="text-center">1</td> <td class="text-center">1</td> <td class="text-center">0</td> @@ -334,7 +334,7 @@ pt6_1: 自定义{"status":0} </tr> <tr class='passClass warning'> - <td>android_events.test_gettime.gettimeTestCase</td> + <td>testcase.android_events.test_gettime.gettimeTestCase</td> <td class="text-center">1</td> <td class="text-center">1</td> <td class="text-center">0</td> @@ -354,7 +354,7 @@ pt6_1: 自定义{"status":0} <div id='div_pt7_1' class="collapse in"> <pre> -pt7_1: {"ts":1604891259987,"status":0} +pt7_1: {"ts":1604902935788,"status":0} </pre> @@ -363,7 +363,7 @@ pt7_1: {"ts":1604891259987,"status":0} </tr> <tr class='passClass warning'> - <td>android_events.test_install.installTestCase</td> + <td>testcase.android_events.test_install.installTestCase</td> <td class="text-center">1</td> <td class="text-center">1</td> <td class="text-center">0</td> @@ -393,7 +393,7 @@ pt8_1: </tr> <tr class='passClass warning'> - <td>android_events.test_login.loninTestCase</td> + <td>testcase.android_events.test_login.loninTestCase</td> <td class="text-center">1</td> <td class="text-center">1</td> <td class="text-center">0</td> @@ -422,7 +422,7 @@ pt9_1: 登录{"status":0} </tr> <tr class='passClass warning'> - <td>android_events.test_pageduration.pagedurationTestCase</td> + <td>testcase.android_events.test_pageduration.pagedurationTestCase</td> <td class="text-center">1</td> <td class="text-center">1</td> <td class="text-center">0</td> @@ -451,7 +451,7 @@ pt10_1: App页面浏览时长分布:{"status":0} </tr> <tr class='passClass warning'> - <td>android_events.test_payment.payTestCase</td> + <td>testcase.android_events.test_payment.payTestCase</td> <td class="text-center">1</td> <td class="text-center">1</td> <td class="text-center">0</td> @@ -480,7 +480,7 @@ pt11_1: 付费{"status":0} </tr> <tr class='passClass warning'> - <td>android_events.test_payorder.payorderTestCase</td> + <td>testcase.android_events.test_payorder.payorderTestCase</td> <td class="text-center">1</td> <td class="text-center">1</td> <td class="text-center">0</td> @@ -509,7 +509,7 @@ pt12_1: 订单{"status":0} </tr> <tr class='passClass warning'> - <td>android_events.test_register.registerTestCase</td> + <td>testcase.android_events.test_register.registerTestCase</td> <td class="text-center">1</td> <td class="text-center">1</td> <td class="text-center">0</td> @@ -538,7 +538,7 @@ pt13_1: 注册{"status":0} </tr> <tr class='passClass warning'> - <td>android_events.test_startup.startupTestCase</td> + <td>testcase.android_events.test_startup.startupTestCase</td> <td class="text-center">1</td> <td class="text-center">1</td> <td class="text-center">0</td> diff --git a/testcase/run_all_cases.py b/testcase/run_all_cases.py index aa342f9..3512a65 100644 --- a/testcase/run_all_cases.py +++ b/testcase/run_all_cases.py @@ -8,13 +8,21 @@ import unittest import os -import HTMLTestRunner +import HTMLTestReportCN import sys +import importlib +importlib.reload(sys) +"""解决在Jenkins控制台无法打印中文的问题""" +os.environ['NLS_LANG'] = 'Simplified Chinese_CHINA.ZHS16GBK' + +"""解决在命令行下找不到module的问题""" curPath = os.path.abspath(os.path.dirname(__file__)) rootPath = os.path.split(curPath)[0] sys.path.append(rootPath) + +"""添加用例地址""" case_path = os.path.join(os.getcwd()) report_path = r"/Users/zhaihuitao/PycharmProjects/TKIO/interfaceTest/report/result.html" @@ -26,13 +34,15 @@ def all_case(): if __name__ == "__main__": fp = open(report_path, 'wb') - runner = HTMLTestRunner.HTMLTestRunner( + runner = HTMLTestReportCN.HTMLTestRunner( stream=fp, title='<TKIO接口监控报告>', description=u'TKIO接口自动化测试用例', tester=u"翟会涛" ) runner.run(all_case()) + """在控制台打印日志""" + unittest.TextTestRunner(verbosity=2).run(all_case()) fp.close() -- libgit2 0.27.1