Commit b24aa8e0 by zhaihuitao

add install enevt

parent e08dfdec
...@@ -3,7 +3,8 @@ ...@@ -3,7 +3,8 @@
<component name="ChangeListManager"> <component name="ChangeListManager">
<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$/config/prod/params.py" afterPath="$PROJECT_DIR$/config/prod/params.py" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/config/envcfg.py" afterPath="$PROJECT_DIR$/config/envcfg.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_startup.py" afterPath="$PROJECT_DIR$/testcase/android_events/test_startup.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" />
...@@ -95,12 +96,14 @@ ...@@ -95,12 +96,14 @@
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="test_install.py" pinned="false" current-in-tab="false"> <file leaf-file-name="test_install.py" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/testcase/android_events/test_install.py"> <entry file="file://$PROJECT_DIR$/testcase/android_events/test_install.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="150"> <state relative-caret-position="125">
<caret line="10" column="0" lean-forward="false" selection-start-line="10" selection-start-column="0" selection-end-line="10" selection-end-column="30" /> <caret line="13" column="1" lean-forward="false" selection-start-line="13" selection-start-column="1" selection-end-line="13" selection-end-column="1" />
<folding /> <folding>
<element signature="e#102#117#0" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -120,14 +123,16 @@ ...@@ -120,14 +123,16 @@
<file leaf-file-name="envcfg.py" pinned="false" current-in-tab="false"> <file leaf-file-name="envcfg.py" pinned="false" current-in-tab="false">
<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="15"> <state relative-caret-position="326">
<caret line="9" column="29" lean-forward="true" selection-start-line="9" selection-start-column="29" selection-end-line="9" selection-end-column="29" /> <caret line="27" column="46" lean-forward="false" selection-start-line="27" selection-start-column="46" selection-end-line="27" selection-end-column="46" />
<folding /> <folding>
<element signature="e#98#120#0" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="params.py" pinned="false" current-in-tab="true"> <file leaf-file-name="params.py" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/config/prod/params.py"> <entry file="file://$PROJECT_DIR$/config/prod/params.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="160"> <state relative-caret-position="160">
...@@ -140,8 +145,8 @@ ...@@ -140,8 +145,8 @@
<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">
<state relative-caret-position="75"> <state relative-caret-position="240">
<caret line="5" column="6" lean-forward="true" selection-start-line="5" selection-start-column="6" selection-end-line="5" selection-end-column="6" /> <caret line="16" column="101" lean-forward="true" selection-start-line="16" selection-start-column="101" selection-end-line="16" selection-end-column="101" />
<folding> <folding>
<element signature="e#103#118#0" expanded="true" /> <element signature="e#103#118#0" expanded="true" />
</folding> </folding>
...@@ -180,14 +185,14 @@ ...@@ -180,14 +185,14 @@
<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/baseEvent.py" /> <option value="$PROJECT_DIR$/testcase/android_click/baseEvent.py" />
<option value="$PROJECT_DIR$/testcase/android_click/test_install.py" /> <option value="$PROJECT_DIR$/testcase/android_click/test_install.py" />
<option value="$PROJECT_DIR$/config/envcfg.py" />
<option value="$PROJECT_DIR$/testcase/android_click/installEvent.py" /> <option value="$PROJECT_DIR$/testcase/android_click/installEvent.py" />
<option value="$PROJECT_DIR$/testcase/android_events/installEvent.py" /> <option value="$PROJECT_DIR$/testcase/android_events/installEvent.py" />
<option value="$PROJECT_DIR$/testcase/android_click/test_click.py" /> <option value="$PROJECT_DIR$/testcase/android_click/test_click.py" />
<option value="$PROJECT_DIR$/testcase/android_events/test_install.py" />
<option value="$PROJECT_DIR$/common/randomUtil.py" /> <option value="$PROJECT_DIR$/common/randomUtil.py" />
<option value="$PROJECT_DIR$/testcase/android_events/test_startup.py" />
<option value="$PROJECT_DIR$/config/prod/params.py" /> <option value="$PROJECT_DIR$/config/prod/params.py" />
<option value="$PROJECT_DIR$/testcase/android_events/test_startup.py" />
<option value="$PROJECT_DIR$/config/envcfg.py" />
<option value="$PROJECT_DIR$/testcase/android_events/test_install.py" />
</list> </list>
</option> </option>
</component> </component>
...@@ -784,7 +789,14 @@ ...@@ -784,7 +789,14 @@
<option name="project" value="LOCAL" /> <option name="project" value="LOCAL" />
<updated>1597655977117</updated> <updated>1597655977117</updated>
</task> </task>
<option name="localTasksCounter" value="23" /> <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>
<option name="localTasksCounter" value="24" />
<servers /> <servers />
</component> </component>
<component name="TestHistory"> <component name="TestHistory">
...@@ -942,7 +954,9 @@ ...@@ -942,7 +954,9 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="210"> <state relative-caret-position="210">
<caret line="18" column="119" lean-forward="false" selection-start-line="18" selection-start-column="119" selection-end-line="18" selection-end-column="119" /> <caret line="18" column="119" lean-forward="false" selection-start-line="18" selection-start-column="119" selection-end-line="18" selection-end-column="119" />
<folding /> <folding>
<element signature="e#102#117#0" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -960,7 +974,9 @@ ...@@ -960,7 +974,9 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="135"> <state relative-caret-position="135">
<caret line="9" column="29" lean-forward="true" selection-start-line="9" selection-start-column="29" selection-end-line="9" selection-end-column="29" /> <caret line="9" column="29" lean-forward="true" selection-start-line="9" selection-start-column="29" selection-end-line="9" selection-end-column="29" />
<folding /> <folding>
<element signature="e#98#120#0" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -1025,7 +1041,9 @@ ...@@ -1025,7 +1041,9 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="840"> <state relative-caret-position="840">
<caret line="59" column="17" lean-forward="true" selection-start-line="59" selection-start-column="17" selection-end-line="59" selection-end-column="17" /> <caret line="59" column="17" lean-forward="true" selection-start-line="59" selection-start-column="17" selection-end-line="59" selection-end-column="17" />
<folding /> <folding>
<element signature="e#98#120#0" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -1041,7 +1059,9 @@ ...@@ -1041,7 +1059,9 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="225"> <state relative-caret-position="225">
<caret line="19" column="43" lean-forward="true" selection-start-line="19" selection-start-column="43" selection-end-line="19" selection-end-column="43" /> <caret line="19" column="43" lean-forward="true" selection-start-line="19" selection-start-column="43" selection-end-line="19" selection-end-column="43" />
<folding /> <folding>
<element signature="e#102#117#0" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -1225,37 +1245,41 @@ ...@@ -1225,37 +1245,41 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/testcase/android_events/test_install.py"> <entry file="file://$PROJECT_DIR$/config/prod/params.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="150"> <state relative-caret-position="160">
<caret line="10" column="0" lean-forward="false" selection-start-line="10" selection-start-column="0" selection-end-line="10" selection-end-column="30" /> <caret line="52" column="56" lean-forward="true" selection-start-line="52" selection-start-column="56" selection-end-line="52" selection-end-column="56" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/config/envcfg.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">
<state relative-caret-position="15"> <state relative-caret-position="240">
<caret line="9" column="29" lean-forward="true" selection-start-line="9" selection-start-column="29" selection-end-line="9" selection-end-column="29" /> <caret line="16" column="101" lean-forward="true" selection-start-line="16" selection-start-column="101" selection-end-line="16" selection-end-column="101" />
<folding /> <folding>
<element signature="e#103#118#0" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/testcase/android_events/test_startup.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="75"> <state relative-caret-position="326">
<caret line="5" column="6" lean-forward="true" selection-start-line="5" selection-start-column="6" selection-end-line="5" selection-end-column="6" /> <caret line="27" column="46" lean-forward="false" selection-start-line="27" selection-start-column="46" selection-end-line="27" selection-end-column="46" />
<folding> <folding>
<element signature="e#103#118#0" expanded="true" /> <element signature="e#98#120#0" expanded="true" />
</folding> </folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/config/prod/params.py"> <entry file="file://$PROJECT_DIR$/testcase/android_events/test_install.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="160"> <state relative-caret-position="125">
<caret line="52" column="56" lean-forward="true" selection-start-line="52" selection-start-column="56" selection-end-line="52" selection-end-column="56" /> <caret line="13" column="1" lean-forward="false" selection-start-line="13" selection-start-column="1" selection-end-line="13" selection-end-column="1" />
<folding /> <folding>
<element signature="e#102#117#0" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
......
...@@ -24,6 +24,9 @@ prod = { ...@@ -24,6 +24,9 @@ prod = {
}, },
} }
headers = {'Content-Type': 'application/json'}
prod_params = { prod_params = {
'androidid': "43214532142142", 'androidid': "43214532142142",
'imei': randomUtil.r.randimei(), 'imei': randomUtil.r.randimei(),
......
...@@ -8,10 +8,10 @@ ...@@ -8,10 +8,10 @@
import requests import requests
import json import json
import unittest import unittest
from config.envcfg import prod from config.envcfg import prod,headers
from config.prod.params import params_install from config.prod.params import params_install
headers = {'Content-Type': 'application/json'} #headers = {'Content-Type': 'application/json'}
class installTestCase(unittest.TestCase): class installTestCase(unittest.TestCase):
......
...@@ -12,8 +12,6 @@ import requests ...@@ -12,8 +12,6 @@ import requests
from config.envcfg import prod from config.envcfg import prod
print(prod['events']['url']) class startupTestCase(unittest.TestCase):
'''class startupTestCase(unittest.TestCase):
def teststartup(self): def teststartup(self):
r = requests.post(url=prod['events']['url'] + 'startup', data=s, headers=headers, timeout=10)''' r = requests.post(url=prod['events']['url'] + 'startup', data=s, headers=headers, timeout=10)
\ No newline at end of file \ No newline at end of file
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