Commit 2052fd65 by zhaihuitao

update

parent b022a77a
...@@ -4,17 +4,7 @@ ...@@ -4,17 +4,7 @@
<list default="true" id="d0064643-2990-4ed3-bfb0-875849b30f4e" name="Default" comment=""> <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$/.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$/report/result.html" afterPath="$PROJECT_DIR$/report/result.html" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/testcase/android_events/test_adshow.py" afterPath="$PROJECT_DIR$/testcase/android_events/test_adshow.py" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/testcase/android_click/test_click.py" afterPath="$PROJECT_DIR$/testcase/android_click/test_click.py" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/testcase/android_events/test_appduration.py" afterPath="$PROJECT_DIR$/testcase/android_events/test_appduration.py" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/testcase/android_events/test_batchUpload.py" afterPath="$PROJECT_DIR$/testcase/android_events/test_batchUpload.py" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/testcase/android_events/test_custom.py" afterPath="$PROJECT_DIR$/testcase/android_events/test_custom.py" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/testcase/android_events/test_install.py" afterPath="$PROJECT_DIR$/testcase/android_events/test_install.py" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/testcase/android_events/test_login.py" afterPath="$PROJECT_DIR$/testcase/android_events/test_login.py" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/testcase/android_events/test_pageduration.py" afterPath="$PROJECT_DIR$/testcase/android_events/test_pageduration.py" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/testcase/android_events/test_payment.py" afterPath="$PROJECT_DIR$/testcase/android_events/test_payment.py" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/testcase/android_events/test_payorder.py" afterPath="$PROJECT_DIR$/testcase/android_events/test_payorder.py" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/testcase/android_events/test_register.py" afterPath="$PROJECT_DIR$/testcase/android_events/test_register.py" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/testcase/android_events/test_startup.py" afterPath="$PROJECT_DIR$/testcase/android_events/test_startup.py" />
</list> </list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="TRACKING_ENABLED" value="true" /> <option name="TRACKING_ENABLED" value="true" />
...@@ -89,11 +79,11 @@ ...@@ -89,11 +79,11 @@
<component name="ExecutionTargetManager" SELECTED_TARGET="default_target" /> <component name="ExecutionTargetManager" SELECTED_TARGET="default_target" />
<component name="FileEditorManager"> <component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300"> <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file leaf-file-name="test_gettime.py" pinned="false" current-in-tab="false"> <file leaf-file-name="test_click.py" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/testcase/android_events/test_gettime.py"> <entry file="file://$PROJECT_DIR$/testcase/android_click/test_click.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="60"> <state relative-caret-position="285">
<caret line="4" column="24" lean-forward="false" selection-start-line="4" selection-start-column="24" selection-end-line="4" selection-end-column="24" /> <caret line="24" column="14" lean-forward="false" selection-start-line="24" selection-start-column="14" selection-end-line="24" selection-end-column="14" />
<folding /> <folding />
</state> </state>
</provider> </provider>
...@@ -111,7 +101,7 @@ ...@@ -111,7 +101,7 @@
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="tokenTest.py" pinned="false" current-in-tab="true"> <file leaf-file-name="tokenTest.py" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/testcase/android_events/tokenTest.py"> <entry file="file://$PROJECT_DIR$/testcase/android_events/tokenTest.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="300"> <state relative-caret-position="300">
...@@ -143,6 +133,18 @@ ...@@ -143,6 +133,18 @@
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="test_adclick.py" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/testcase/android_events/test_adclick.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="270">
<caret line="18" column="21" lean-forward="false" selection-start-line="18" selection-start-column="21" selection-end-line="18" selection-end-column="21" />
<folding>
<element signature="e#103#118#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="test_payorder.py" pinned="false" current-in-tab="false"> <file leaf-file-name="test_payorder.py" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/testcase/android_events/test_payorder.py"> <entry file="file://$PROJECT_DIR$/testcase/android_events/test_payorder.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
...@@ -163,16 +165,6 @@ ...@@ -163,16 +165,6 @@
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="test_custom.py" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/testcase/android_events/test_custom.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="195">
<caret line="17" column="21" lean-forward="false" selection-start-line="17" selection-start-column="21" selection-end-line="17" selection-end-column="21" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="test_startup.py" pinned="false" current-in-tab="false"> <file leaf-file-name="test_startup.py" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/testcase/android_events/test_startup.py"> <entry file="file://$PROJECT_DIR$/testcase/android_events/test_startup.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
...@@ -247,7 +239,6 @@ ...@@ -247,7 +239,6 @@
<option value="$PROJECT_DIR$/testcase/android_events/test_token.py" /> <option value="$PROJECT_DIR$/testcase/android_events/test_token.py" />
<option value="$PROJECT_DIR$/testcase/android_events/tokenTest.py" /> <option value="$PROJECT_DIR$/testcase/android_events/tokenTest.py" />
<option value="$PROJECT_DIR$/testcase/android_click/click.py" /> <option value="$PROJECT_DIR$/testcase/android_click/click.py" />
<option value="$PROJECT_DIR$/testcase/android_click/test_click.py" />
<option value="$PROJECT_DIR$/common/iniUtil.py" /> <option value="$PROJECT_DIR$/common/iniUtil.py" />
<option value="$PROJECT_DIR$/config/setting/config.ini" /> <option value="$PROJECT_DIR$/config/setting/config.ini" />
<option value="$PROJECT_DIR$/common/socket/socketTest.py" /> <option value="$PROJECT_DIR$/common/socket/socketTest.py" />
...@@ -272,6 +263,7 @@ ...@@ -272,6 +263,7 @@
<option value="$PROJECT_DIR$/testcase/android_events/test_payorder.py" /> <option value="$PROJECT_DIR$/testcase/android_events/test_payorder.py" />
<option value="$PROJECT_DIR$/testcase/android_events/test_register.py" /> <option value="$PROJECT_DIR$/testcase/android_events/test_register.py" />
<option value="$PROJECT_DIR$/testcase/android_events/test_startup.py" /> <option value="$PROJECT_DIR$/testcase/android_events/test_startup.py" />
<option value="$PROJECT_DIR$/testcase/android_click/test_click.py" />
</list> </list>
</option> </option>
</component> </component>
...@@ -361,6 +353,24 @@ ...@@ -361,6 +353,24 @@
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT> </PATH_ELEMENT>
<PATH_ELEMENT> <PATH_ELEMENT>
<option name="myItemId" value="testcase" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="android_click" />
<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="myItemId" value="report" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT> </PATH_ELEMENT>
...@@ -676,13 +686,6 @@ ...@@ -676,13 +686,6 @@
<updated>1596505503233</updated> <updated>1596505503233</updated>
<workItem from="1596786333197" duration="228000" /> <workItem from="1596786333197" duration="228000" />
</task> </task>
<task id="LOCAL-00023" summary="add install enevt">
<created>1597656832020</created>
<option name="number" value="00023" />
<option name="presentableId" value="LOCAL-00023" />
<option name="project" value="LOCAL" />
<updated>1597656832020</updated>
</task>
<task id="LOCAL-00024" summary="add install enevt"> <task id="LOCAL-00024" summary="add install enevt">
<created>1597657096457</created> <created>1597657096457</created>
<option name="number" value="00024" /> <option name="number" value="00024" />
...@@ -1019,7 +1022,14 @@ ...@@ -1019,7 +1022,14 @@
<option name="project" value="LOCAL" /> <option name="project" value="LOCAL" />
<updated>1604903545378</updated> <updated>1604903545378</updated>
</task> </task>
<option name="localTasksCounter" value="72" /> <task id="LOCAL-00072" summary="update">
<created>1604903723103</created>
<option name="number" value="00072" />
<option name="presentableId" value="LOCAL-00072" />
<option name="project" value="LOCAL" />
<updated>1604903723103</updated>
</task>
<option name="localTasksCounter" value="73" />
<servers /> <servers />
</component> </component>
<component name="TestHistory"> <component name="TestHistory">
...@@ -1264,14 +1274,6 @@ ...@@ -1264,14 +1274,6 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/testcase/android_click/test_click.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="300">
<caret line="25" column="27" lean-forward="false" selection-start-line="25" selection-start-column="27" selection-end-line="25" selection-end-column="27" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/config/envcfg.py"> <entry file="file://$PROJECT_DIR$/config/envcfg.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="218"> <state relative-caret-position="218">
...@@ -1370,19 +1372,19 @@ ...@@ -1370,19 +1372,19 @@
<element signature="n#style#0;n#h1#0;n#div#0;n#body#0;n#html#0;n#!!top" 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#3653#3657#0" expanded="true" />
<element signature="e#3667#3671#0" expanded="true" /> <element signature="e#3667#3671#0" expanded="true" />
<marker date="1604903558673" expanded="true" signature="17850:18153" ph="..." /> <marker date="1604903743610" expanded="true" signature="17850:18153" ph="..." />
<marker date="1604903558673" expanded="true" signature="18189:18890" ph="..." /> <marker date="1604903743610" expanded="true" signature="18782:18920" ph="..." />
<marker date="1604903558673" expanded="true" signature="18295:18884" ph="..." /> <marker date="1604903743610" expanded="true" signature="18782:18914" ph="..." />
<marker date="1604903558673" expanded="true" signature="18305:18511" ph="..." /> <marker date="1604903743610" expanded="true" signature="18305:18511" ph="..." />
<marker date="1604903558673" expanded="true" signature="18725:18874" ph="..." /> <marker date="1604903743610" expanded="true" signature="18782:18904" ph="..." />
<marker date="1604903558673" expanded="true" signature="18735:18863" ph="..." /> <marker date="1604903743610" expanded="true" signature="18782:18893" ph="..." />
<marker date="1604903558673" expanded="true" signature="18938:19047" ph="..." /> <marker date="1604903743610" expanded="true" signature="18968:19077" ph="..." />
<marker date="1604903558673" expanded="true" signature="19076:19082" ph=" " /> <marker date="1604903743610" expanded="true" signature="19106:19112" ph=" " />
<marker date="1604903558673" expanded="true" signature="19105:19184" ph="..." /> <marker date="1604903743610" expanded="true" signature="19135:19214" ph="..." />
<marker date="1604903558673" expanded="true" signature="19185:19309" ph="..." /> <marker date="1604903743610" expanded="true" signature="19215:19339" ph="..." />
<marker date="1604903558673" expanded="true" signature="19202:19303" ph="..." /> <marker date="1604903743610" expanded="true" signature="19232:19333" ph="..." />
<marker date="1604903558673" expanded="true" signature="19252:19267" ph="..." /> <marker date="1604903743610" expanded="true" signature="19282:19297" ph="..." />
<marker date="1604903558673" expanded="true" signature="19287:19299" ph="..." /> <marker date="1604903743610" expanded="true" signature="19317:19329" ph="..." />
</folding> </folding>
</state> </state>
</provider> </provider>
...@@ -1427,16 +1429,6 @@ ...@@ -1427,16 +1429,6 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/testcase/android_events/test_adclick.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="270">
<caret line="18" column="21" lean-forward="false" selection-start-line="18" selection-start-column="21" selection-end-line="18" selection-end-column="21" />
<folding>
<element signature="e#103#118#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/testcase/android_events/test_adshow.py"> <entry file="file://$PROJECT_DIR$/testcase/android_events/test_adshow.py">
<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">
...@@ -1547,5 +1539,23 @@ ...@@ -1547,5 +1539,23 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/testcase/android_events/test_adclick.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="270">
<caret line="18" column="21" lean-forward="false" selection-start-line="18" selection-start-column="21" selection-end-line="18" selection-end-column="21" />
<folding>
<element signature="e#103#118#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/testcase/android_click/test_click.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="285">
<caret line="24" column="14" lean-forward="false" selection-start-line="24" selection-start-column="14" selection-end-line="24" selection-end-column="14" />
<folding />
</state>
</provider>
</entry>
</component> </component>
</project> </project>
\ No newline at end of file
...@@ -123,8 +123,8 @@ function html_escape(s) { ...@@ -123,8 +123,8 @@ function html_escape(s) {
<div class='heading'> <div class='heading'>
<h1 style="font-family: Microsoft YaHei">&lt;TKIO接口监控报告&gt;</h1> <h1 style="font-family: Microsoft YaHei">&lt;TKIO接口监控报告&gt;</h1>
<p class='attribute'><strong>测试人员 : </strong> 翟会涛</p> <p class='attribute'><strong>测试人员 : </strong> 翟会涛</p>
<p class='attribute'><strong>开始时间 : </strong> 2020-11-09 14:32:35</p> <p class='attribute'><strong>开始时间 : </strong> 2020-11-09 14:35:37</p>
<p class='attribute'><strong>合计耗时 : </strong> 0:00:02.898860</p> <p class='attribute'><strong>合计耗时 : </strong> 0:00:06.206539</p>
<p class='attribute'><strong>测试结果 : </strong> 共 14,通过 14,通过率= 100.00%</p> <p class='attribute'><strong>测试结果 : </strong> 共 14,通过 14,通过率= 100.00%</p>
<p class='description'>TKIO接口自动化测试用例</p> <p class='description'>TKIO接口自动化测试用例</p>
...@@ -238,7 +238,7 @@ pt2_1: click:{"status":0} ...@@ -238,7 +238,7 @@ pt2_1: click:{"status":0}
<pre> <pre>
pt3_1: pt3_1:
adshow{"status":0} adshow:{"status":0}
</pre> </pre>
...@@ -267,7 +267,7 @@ adshow:{"status":0} ...@@ -267,7 +267,7 @@ adshow:{"status":0}
<div id='div_pt4_1' class="collapse in"> <div id='div_pt4_1' class="collapse in">
<pre> <pre>
pt4_1: appduration{"status":0} pt4_1: appduration:{"status":0}
</pre> </pre>
...@@ -296,7 +296,7 @@ pt4_1: appduration:{"status":0} ...@@ -296,7 +296,7 @@ pt4_1: appduration:{"status":0}
<div id='div_pt5_1' class="collapse in"> <div id='div_pt5_1' class="collapse in">
<pre> <pre>
pt5_1: 自定义 pt5_1: batch
</pre> </pre>
...@@ -325,7 +325,7 @@ pt5_1: 自定义 ...@@ -325,7 +325,7 @@ pt5_1: 自定义
<div id='div_pt6_1' class="collapse in"> <div id='div_pt6_1' class="collapse in">
<pre> <pre>
pt6_1: 自定义{"status":0} pt6_1: custom{"status":0}
</pre> </pre>
...@@ -354,7 +354,7 @@ pt6_1: 自定义{"status":0} ...@@ -354,7 +354,7 @@ pt6_1: 自定义{"status":0}
<div id='div_pt7_1' class="collapse in"> <div id='div_pt7_1' class="collapse in">
<pre> <pre>
pt7_1: {"ts":1604903557908,"status":0} pt7_1: {"ts":1604903740858,"status":0}
</pre> </pre>
...@@ -384,7 +384,7 @@ pt7_1: {"ts":1604903557908,"status":0} ...@@ -384,7 +384,7 @@ pt7_1: {"ts":1604903557908,"status":0}
<pre> <pre>
pt8_1: pt8_1:
激活事件执行结果:{"status":0} install:{"status":0}
</pre> </pre>
...@@ -413,7 +413,7 @@ pt8_1: ...@@ -413,7 +413,7 @@ pt8_1:
<div id='div_pt9_1' class="collapse in"> <div id='div_pt9_1' class="collapse in">
<pre> <pre>
pt9_1: 登录{"status":0} pt9_1: login{"status":0}
</pre> </pre>
...@@ -442,7 +442,7 @@ pt9_1: 登录{"status":0} ...@@ -442,7 +442,7 @@ pt9_1: 登录{"status":0}
<div id='div_pt10_1' class="collapse in"> <div id='div_pt10_1' class="collapse in">
<pre> <pre>
pt10_1: App页面浏览时长分布:{"status":0} pt10_1: pageduration:{"status":0}
</pre> </pre>
...@@ -471,7 +471,7 @@ pt10_1: App页面浏览时长分布:{"status":0} ...@@ -471,7 +471,7 @@ pt10_1: App页面浏览时长分布:{"status":0}
<div id='div_pt11_1' class="collapse in"> <div id='div_pt11_1' class="collapse in">
<pre> <pre>
pt11_1: 付费{"status":0} pt11_1: payment{"status":0}
</pre> </pre>
...@@ -500,7 +500,7 @@ pt11_1: 付费{"status":0} ...@@ -500,7 +500,7 @@ pt11_1: 付费{"status":0}
<div id='div_pt12_1' class="collapse in"> <div id='div_pt12_1' class="collapse in">
<pre> <pre>
pt12_1: 订单{"status":0} pt12_1: payorder{"status":0}
</pre> </pre>
...@@ -529,7 +529,7 @@ pt12_1: 订单{"status":0} ...@@ -529,7 +529,7 @@ pt12_1: 订单{"status":0}
<div id='div_pt13_1' class="collapse in"> <div id='div_pt13_1' class="collapse in">
<pre> <pre>
pt13_1: 注册{"status":0} pt13_1: register{"status":0}
</pre> </pre>
...@@ -558,7 +558,7 @@ pt13_1: 注册{"status":0} ...@@ -558,7 +558,7 @@ pt13_1: 注册{"status":0}
<div id='div_pt14_1' class="collapse in"> <div id='div_pt14_1' class="collapse in">
<pre> <pre>
pt14_1: 启动{"status":0,"caid":"00_658BF93B71D8CCD446667DF1FC8F5112_A621A8F4404C9B0D3CF26AA86457456A","type":1} pt14_1: startup{"status":0,"caid":"00_658BF93B71D8CCD446667DF1FC8F5112_A621A8F4404C9B0D3CF26AA86457456A","type":1}
</pre> </pre>
......
...@@ -21,8 +21,8 @@ class clickTestCase(unittest.TestCase): ...@@ -21,8 +21,8 @@ class clickTestCase(unittest.TestCase):
def testclick(self): def testclick(self):
p = requests.get(url=click_url, params=params_click, timeout=30, verify=False) p = requests.get(url=click_url, params=params_click, timeout=30, verify=False)
# self.assertEqual(p.status_code, 300, msg='接口异常,请检查') # self.assertEqual(p.status_code, 300, msg='接口异常,请检查')
print('执行结果:\n=================') print('click'+p.text)
print(p) # print(p)
# time.sleep(7) # time.sleep(7)
# try: # try:
# allEvent().installUpload(randomUtil.r.randimei(), randomUtil.r.randip(), prod['events']['appkey'], prod['cmpaignid']) # allEvent().installUpload(randomUtil.r.randimei(), randomUtil.r.randip(), prod['events']['appkey'], prod['cmpaignid'])
......
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 to comment