Commit 9a878286 by zhaihuitao

update

parent c75c84cf
...@@ -2,11 +2,12 @@ ...@@ -2,11 +2,12 @@
<project version="4"> <project version="4">
<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="NEW" beforePath="" afterPath="$PROJECT_DIR$/testcase/android_events/test_appduration.py" /> <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/testcase/android_events/test_batchUpload.py" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/testcase/android_events/test_pageduration.py" /> <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/testcase/android_events/tokenTest.py" />
<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/envcfg.py" afterPath="$PROJECT_DIR$/config/envcfg.py" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/config/prod/params.py" afterPath="$PROJECT_DIR$/config/prod/params.py" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/config/prod/params.py" afterPath="$PROJECT_DIR$/config/prod/params.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_install.py" afterPath="$PROJECT_DIR$/testcase/android_events/test_install.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" />
...@@ -18,16 +19,20 @@ ...@@ -18,16 +19,20 @@
<component name="CoverageDataManager"> <component name="CoverageDataManager">
<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$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_register_py.coverage" NAME="Nosetests in test_register.py Coverage Results" MODIFIED="1597913123658" 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" /> <SUITE FILE_PATH="coverage/interfaceTest$Nosetests_in_test_register_py.coverage" NAME="Nosetests in test_register.py Coverage Results" MODIFIED="1597913123658" 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" />
<SUITE FILE_PATH="coverage/interfaceTest$Nosetests_in_test_batchUpload_py.coverage" NAME="Nosetests in test_batchUpload.py Coverage Results" MODIFIED="1598511528888" 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" />
<SUITE FILE_PATH="coverage/trackingIO$Nosetests_for_test_install_installTestCase.coverage" NAME="Nosetests for test_install.installTestCase Coverage Results" MODIFIED="1597283305272" 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/trackingIO$Nosetests_for_test_install_installTestCase.coverage" NAME="Nosetests for test_install.installTestCase Coverage Results" MODIFIED="1597283305272" 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$Nosetests_in_test_install_py.coverage" NAME="Nosetests in test_install.py Coverage Results" MODIFIED="1598520228983" 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" />
<SUITE FILE_PATH="coverage/interfaceTest$Nosetests_in_test_login_py.coverage" NAME="Nosetests in test_login.py Coverage Results" MODIFIED="1597913967120" 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" /> <SUITE FILE_PATH="coverage/interfaceTest$Nosetests_in_test_login_py.coverage" NAME="Nosetests in test_login.py Coverage Results" MODIFIED="1597913967120" 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" />
<SUITE FILE_PATH="coverage/trackingIO$envcfg.coverage" NAME="envcfg Coverage Results" MODIFIED="1597136533680" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/config" /> <SUITE FILE_PATH="coverage/trackingIO$envcfg.coverage" NAME="envcfg Coverage Results" MODIFIED="1597136533680" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/config" />
<SUITE FILE_PATH="coverage/interfaceTest$tokenTest.coverage" NAME="tokenTest Coverage Results" MODIFIED="1598518345530" 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" />
<SUITE FILE_PATH="coverage/trackingIO$installEvent.coverage" NAME="installEvent Coverage Results" MODIFIED="1597657118438" 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/trackingIO$installEvent.coverage" NAME="installEvent Coverage Results" MODIFIED="1597657118438" 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$Nosetests_in_test_payorder_py.coverage" NAME="Nosetests in test_payorder.py Coverage Results" MODIFIED="1597991384638" 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" /> <SUITE FILE_PATH="coverage/interfaceTest$Nosetests_in_test_payorder_py.coverage" NAME="Nosetests in test_payorder.py Coverage Results" MODIFIED="1597991384638" 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" />
<SUITE FILE_PATH="coverage/interfaceTest$Nosetests_for_test_pay_payTestCase.coverage" NAME="Nosetests for test_pay.payTestCase Coverage Results" MODIFIED="1597978779361" 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" /> <SUITE FILE_PATH="coverage/interfaceTest$Nosetests_for_test_pay_payTestCase.coverage" NAME="Nosetests for test_pay.payTestCase Coverage Results" MODIFIED="1597978779361" 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" />
<SUITE FILE_PATH="coverage/interfaceTest$Nosetests_in_test_pay_py.coverage" NAME="Nosetests in test_pay.py Coverage Results" MODIFIED="1597980100675" 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" /> <SUITE FILE_PATH="coverage/interfaceTest$Nosetests_in_test_pay_py.coverage" NAME="Nosetests in test_pay.py Coverage Results" MODIFIED="1597980100675" 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" />
<SUITE FILE_PATH="coverage/interfaceTest$Nosetests_in_test_token_py.coverage" NAME="Nosetests in test_token.py Coverage Results" MODIFIED="1598517865391" 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" />
<SUITE FILE_PATH="coverage/interfaceTest$Nosetests_in_test_custom_py.coverage" NAME="Nosetests in test_custom.py Coverage Results" MODIFIED="1597999802477" 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" /> <SUITE FILE_PATH="coverage/interfaceTest$Nosetests_in_test_custom_py.coverage" NAME="Nosetests in test_custom.py Coverage Results" MODIFIED="1597999802477" 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" />
<SUITE FILE_PATH="coverage/interfaceTest$Nosetests_in_test_adshow_py.coverage" NAME="Nosetests in test_adshow.py Coverage Results" MODIFIED="1598004274765" 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" /> <SUITE FILE_PATH="coverage/interfaceTest$Nosetests_in_test_adshow_py.coverage" NAME="Nosetests in test_adshow.py Coverage Results" MODIFIED="1598004274765" 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" />
<SUITE FILE_PATH="coverage/interfaceTest$Nosetests_for_test_install_installTestCase_testinstall.coverage" NAME="Nosetests for test_install.installTestCase.testinstall Coverage Results" MODIFIED="1598258331962" 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" /> <SUITE FILE_PATH="coverage/interfaceTest$Nosetests_for_test_install_installTestCase_testinstall.coverage" NAME="Nosetests for test_install.installTestCase.testinstall Coverage Results" MODIFIED="1598519134009" 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" />
<SUITE FILE_PATH="coverage/trackingIO$Nosetests_in_test_click_py.coverage" NAME="Nosetests in test_click.py Coverage Results" MODIFIED="1596791537385" 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/trackingIO$Nosetests_in_test_click_py.coverage" NAME="Nosetests in test_click.py Coverage Results" MODIFIED="1596791537385" 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$Nosetests_in_test_adclick_py.coverage" NAME="Nosetests in test_adclick.py Coverage Results" MODIFIED="1598258215871" 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" /> <SUITE FILE_PATH="coverage/interfaceTest$Nosetests_in_test_adclick_py.coverage" NAME="Nosetests in test_adclick.py Coverage Results" MODIFIED="1598258215871" 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" />
<SUITE FILE_PATH="coverage/trackingIO$randomUtil.coverage" NAME="randomUtil Coverage Results" MODIFIED="1596785449001" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/common" /> <SUITE FILE_PATH="coverage/trackingIO$randomUtil.coverage" NAME="randomUtil Coverage Results" MODIFIED="1596785449001" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/common" />
...@@ -55,119 +60,111 @@ ...@@ -55,119 +60,111 @@
<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_login.py" pinned="false" current-in-tab="false"> <file leaf-file-name="params.py" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/testcase/android_events/test_login.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="297"> <state relative-caret-position="150">
<caret line="20" column="0" lean-forward="false" selection-start-line="20" selection-start-column="0" selection-end-line="21" selection-end-column="19" /> <caret line="10" column="29" lean-forward="false" selection-start-line="10" selection-start-column="29" selection-end-line="10" selection-end-column="29" />
<folding> <folding>
<element signature="e#101#116#0" expanded="true" /> <element signature="e#97#108#0" expanded="true" />
</folding> </folding>
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="test_payment.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_payment.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="322"> <state relative-caret-position="120">
<caret line="24" column="19" lean-forward="false" selection-start-line="24" selection-start-column="19" selection-end-line="24" selection-end-column="19" /> <caret line="12" column="45" lean-forward="true" selection-start-line="12" selection-start-column="45" selection-end-line="12" selection-end-column="45" />
<folding> <folding />
<element signature="e#103#118#0" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="params.py" pinned="false" current-in-tab="false"> <file leaf-file-name="tokenTest.py" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/config/prod/params.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="44"> <state relative-caret-position="315">
<caret line="348" column="7" lean-forward="false" selection-start-line="348" selection-start-column="7" selection-end-line="348" selection-end-column="18" /> <caret line="21" column="13" lean-forward="true" selection-start-line="21" selection-start-column="13" selection-end-line="21" selection-end-column="13" />
<folding> <folding>
<element signature="e#97#108#0" expanded="true" /> <element signature="e#100#115#0" expanded="true" />
</folding> </folding>
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="test_custom.py" pinned="false" current-in-tab="false"> <file leaf-file-name="test_batchUpload.py" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/testcase/android_events/test_custom.py"> <entry file="file://$PROJECT_DIR$/testcase/android_events/test_batchUpload.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="313"> <state relative-caret-position="105">
<caret line="21" column="19" lean-forward="false" selection-start-line="21" selection-start-column="19" selection-end-line="21" selection-end-column="19" /> <caret line="7" column="0" lean-forward="false" selection-start-line="7" selection-start-column="0" selection-end-line="7" selection-end-column="0" />
<folding> <folding>
<element signature="e#102#117#0" expanded="true" /> <element signature="e#108#123#0" expanded="true" />
</folding> </folding>
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="test_adshow.py" pinned="false" current-in-tab="false"> <file leaf-file-name="__init__.py" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/testcase/android_events/test_adshow.py"> <entry file="file://$PROJECT_DIR$/testcase/android_events/__init__.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="0">
<caret line="20" column="26" lean-forward="true" selection-start-line="20" selection-start-column="26" selection-end-line="20" selection-end-column="26" /> <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> <folding />
<element signature="e#102#117#0" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="test_pageduration.py" pinned="false" current-in-tab="false"> <file leaf-file-name="test_install.py" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/testcase/android_events/test_pageduration.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="73"> <state relative-caret-position="120">
<caret line="9" column="0" lean-forward="false" selection-start-line="9" selection-start-column="0" selection-end-line="22" selection-end-column="19" /> <caret line="12" column="0" lean-forward="false" selection-start-line="12" selection-start-column="0" selection-end-line="12" selection-end-column="0" />
<folding> <folding />
<element signature="e#109#124#0" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="test_appduration.py" pinned="false" current-in-tab="true"> <file leaf-file-name="test_adclick.py" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/testcase/android_events/test_appduration.py"> <entry file="file://$PROJECT_DIR$/testcase/android_events/test_adclick.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="180"> <state relative-caret-position="240">
<caret line="12" column="49" lean-forward="true" selection-start-line="12" selection-start-column="49" selection-end-line="12" selection-end-column="49" /> <caret line="20" column="26" lean-forward="false" selection-start-line="20" selection-start-column="26" selection-end-line="20" selection-end-column="26" />
<folding> <folding />
<element signature="e#107#122#0" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="test_startup.py" pinned="false" current-in-tab="false"> <file leaf-file-name="test_custom.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_custom.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="255"> <state relative-caret-position="120">
<caret line="21" column="19" lean-forward="true" selection-start-line="21" selection-start-column="19" selection-end-line="21" selection-end-column="19" /> <caret line="8" column="0" lean-forward="false" selection-start-line="8" selection-start-column="0" selection-end-line="12" selection-end-column="44" />
<folding /> <folding>
<element signature="e#102#117#0" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="test_payorder.py" pinned="false" current-in-tab="false"> <file leaf-file-name="envcfg.py" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/testcase/android_events/test_payorder.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="268"> <state relative-caret-position="300">
<caret line="21" column="19" lean-forward="false" selection-start-line="21" selection-start-column="19" selection-end-line="21" selection-end-column="19" /> <caret line="23" column="38" lean-forward="false" selection-start-line="23" selection-start-column="38" selection-end-line="23" selection-end-column="38" />
<folding> <folding />
<element signature="e#104#119#0" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="test_register.py" pinned="false" current-in-tab="false"> <file leaf-file-name="test_appduration.py" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/testcase/android_events/test_register.py"> <entry file="file://$PROJECT_DIR$/testcase/android_events/test_appduration.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="313"> <state relative-caret-position="165">
<caret line="23" column="19" lean-forward="false" selection-start-line="23" selection-start-column="19" selection-end-line="23" selection-end-column="19" /> <caret line="15" column="45" lean-forward="false" selection-start-line="15" selection-start-column="45" selection-end-line="15" selection-end-column="45" />
<folding> <folding>
<element signature="e#121#136#0" expanded="true" /> <element signature="e#107#122#0" expanded="true" />
</folding> </folding>
</state> </state>
</provider> </provider>
...@@ -207,13 +204,10 @@ ...@@ -207,13 +204,10 @@
<option value="$PROJECT_DIR$/testcase/android_click/test_install.py" /> <option value="$PROJECT_DIR$/testcase/android_click/test_install.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$/config/envcfg.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$/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_pay.py" /> <option value="$PROJECT_DIR$/testcase/android_events/test_pay.py" />
<option value="$PROJECT_DIR$/testcase/android_events/test_adclick.py" />
<option value="$PROJECT_DIR$/testcase/android_events/test_adshow.py" /> <option value="$PROJECT_DIR$/testcase/android_events/test_adshow.py" />
<option value="$PROJECT_DIR$/testcase/android_events/test_custom.py" /> <option value="$PROJECT_DIR$/testcase/android_events/test_custom.py" />
<option value="$PROJECT_DIR$/testcase/android_events/test_login.py" /> <option value="$PROJECT_DIR$/testcase/android_events/test_login.py" />
...@@ -222,8 +216,14 @@ ...@@ -222,8 +216,14 @@
<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_events/test_pageduration.py" /> <option value="$PROJECT_DIR$/testcase/android_events/test_pageduration.py" />
<option value="$PROJECT_DIR$/config/prod/params.py" />
<option value="$PROJECT_DIR$/testcase/android_events/test_appduration.py" /> <option value="$PROJECT_DIR$/testcase/android_events/test_appduration.py" />
<option value="$PROJECT_DIR$/testcase/android_events/test_batchUpload.py" />
<option value="$PROJECT_DIR$/testcase/android_events/test_adclick.py" />
<option value="$PROJECT_DIR$/testcase/android_events/test_token.py" />
<option value="$PROJECT_DIR$/testcase/android_events/tokenTest.py" />
<option value="$PROJECT_DIR$/config/envcfg.py" />
<option value="$PROJECT_DIR$/testcase/android_events/test_install.py" />
<option value="$PROJECT_DIR$/config/prod/params.py" />
</list> </list>
</option> </option>
</component> </component>
...@@ -258,7 +258,6 @@ ...@@ -258,7 +258,6 @@
<foldersAlwaysOnTop value="true" /> <foldersAlwaysOnTop value="true" />
</navigator> </navigator>
<panes> <panes>
<pane id="Scratches" />
<pane id="ProjectPane"> <pane id="ProjectPane">
<subPane> <subPane>
<PATH> <PATH>
...@@ -374,6 +373,7 @@ ...@@ -374,6 +373,7 @@
</subPane> </subPane>
</pane> </pane>
<pane id="Scope" /> <pane id="Scope" />
<pane id="Scratches" />
</panes> </panes>
</component> </component>
<component name="ProjectViewState"> <component name="ProjectViewState">
...@@ -383,7 +383,7 @@ ...@@ -383,7 +383,7 @@
<component name="PropertiesComponent"> <component name="PropertiesComponent">
<property name="WebServerToolWindowFactoryState" value="false" /> <property name="WebServerToolWindowFactoryState" value="false" />
<property name="settings.editor.selected.configurable" value="preferences.lookFeel" /> <property name="settings.editor.selected.configurable" value="preferences.lookFeel" />
<property name="SearchEverywhereHistoryKey" value="set &#9;ACTION&#9;Images.SetBackgroundImage&#10;set background&#9;null&#9;null&#10;backg&#9;null&#9;null" /> <property name="SearchEverywhereHistoryKey" value="set ba&#9;ACTION&#9;Images.SetBackgroundImage&#10;backg&#9;ACTION&#9;Images.SetBackgroundImage&#10;set &#9;ACTION&#9;Images.SetBackgroundImage&#10;set background&#9;null&#9;null" />
<property name="com.intellij.database.dataSource.DataSourceTemplate" value="MySQL" /> <property name="com.intellij.database.dataSource.DataSourceTemplate" value="MySQL" />
</component> </component>
<component name="RecentsManager"> <component name="RecentsManager">
...@@ -405,8 +405,8 @@ ...@@ -405,8 +405,8 @@
</list> </list>
</option> </option>
</component> </component>
<component name="RunManager" selected="Python tests.Nosetests in test_appduration.py"> <component name="RunManager" selected="Python tests.Nosetests in test_install.py">
<configuration default="false" name="Nosetests in test_adshow.py" type="tests" factoryName="Nosetests" temporary="true" nameIsGenerated="true"> <configuration default="false" name="Nosetests in test_batchUpload.py" type="tests" factoryName="Nosetests" temporary="true" nameIsGenerated="true">
<option name="INTERPRETER_OPTIONS" value="" /> <option name="INTERPRETER_OPTIONS" value="" />
<option name="PARENT_ENVS" value="true" /> <option name="PARENT_ENVS" value="true" />
<envs /> <envs />
...@@ -419,11 +419,11 @@ ...@@ -419,11 +419,11 @@
<EXTENSION ID="PythonCoverageRunConfigurationExtension" enabled="false" runner="coverage.py" /> <EXTENSION ID="PythonCoverageRunConfigurationExtension" enabled="false" runner="coverage.py" />
<option name="_new_regexPattern" value="&quot;&quot;" /> <option name="_new_regexPattern" value="&quot;&quot;" />
<option name="_new_additionalArguments" value="&quot;&quot;" /> <option name="_new_additionalArguments" value="&quot;&quot;" />
<option name="_new_target" value="&quot;$PROJECT_DIR$/testcase/android_events/test_adshow.py&quot;" /> <option name="_new_target" value="&quot;$PROJECT_DIR$/testcase/android_events/test_batchUpload.py&quot;" />
<option name="_new_targetType" value="&quot;PATH&quot;" /> <option name="_new_targetType" value="&quot;PATH&quot;" />
<method /> <method />
</configuration> </configuration>
<configuration default="false" name="Nosetests in test_adclick.py" type="tests" factoryName="Nosetests" temporary="true" nameIsGenerated="true"> <configuration default="false" name="Nosetests in tokenTest.py" type="tests" factoryName="Nosetests" temporary="true" nameIsGenerated="true">
<option name="INTERPRETER_OPTIONS" value="" /> <option name="INTERPRETER_OPTIONS" value="" />
<option name="PARENT_ENVS" value="true" /> <option name="PARENT_ENVS" value="true" />
<envs /> <envs />
...@@ -436,28 +436,30 @@ ...@@ -436,28 +436,30 @@
<EXTENSION ID="PythonCoverageRunConfigurationExtension" enabled="false" runner="coverage.py" /> <EXTENSION ID="PythonCoverageRunConfigurationExtension" enabled="false" runner="coverage.py" />
<option name="_new_regexPattern" value="&quot;&quot;" /> <option name="_new_regexPattern" value="&quot;&quot;" />
<option name="_new_additionalArguments" value="&quot;&quot;" /> <option name="_new_additionalArguments" value="&quot;&quot;" />
<option name="_new_target" value="&quot;$PROJECT_DIR$/testcase/android_events/test_adclick.py&quot;" /> <option name="_new_target" value="&quot;$PROJECT_DIR$/testcase/android_events/tokenTest.py&quot;" />
<option name="_new_targetType" value="&quot;PATH&quot;" /> <option name="_new_targetType" value="&quot;PATH&quot;" />
<method /> <method />
</configuration> </configuration>
<configuration default="false" name="Nosetests for test_install.installTestCase.testinstall" type="tests" factoryName="Nosetests" temporary="true" nameIsGenerated="true"> <configuration default="false" name="tokenTest" type="PythonConfigurationType" factoryName="Python" temporary="true">
<option name="INTERPRETER_OPTIONS" value="" /> <option name="INTERPRETER_OPTIONS" value="" />
<option name="PARENT_ENVS" value="true" /> <option name="PARENT_ENVS" value="true" />
<envs /> <envs>
<env name="PYTHONUNBUFFERED" value="1" />
</envs>
<option name="SDK_HOME" value="" /> <option name="SDK_HOME" value="" />
<option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/testcase/android_events" /> <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/testcase/android_events" />
<option name="IS_MODULE_SDK" value="false" /> <option name="IS_MODULE_SDK" value="true" />
<option name="ADD_CONTENT_ROOTS" value="true" /> <option name="ADD_CONTENT_ROOTS" value="true" />
<option name="ADD_SOURCE_ROOTS" value="true" /> <option name="ADD_SOURCE_ROOTS" value="true" />
<module name="trackingIO" /> <module name="trackingIO" />
<EXTENSION ID="PythonCoverageRunConfigurationExtension" enabled="false" runner="coverage.py" /> <EXTENSION ID="PythonCoverageRunConfigurationExtension" enabled="false" sample_coverage="true" runner="coverage.py" />
<option name="_new_regexPattern" value="&quot;&quot;" /> <option name="SCRIPT_NAME" value="$PROJECT_DIR$/testcase/android_events/tokenTest.py" />
<option name="_new_additionalArguments" value="&quot;&quot;" /> <option name="PARAMETERS" value="" />
<option name="_new_target" value="&quot;test_install.installTestCase.testinstall&quot;" /> <option name="SHOW_COMMAND_LINE" value="false" />
<option name="_new_targetType" value="&quot;PYTHON&quot;" /> <option name="EMULATE_TERMINAL" value="false" />
<method /> <method />
</configuration> </configuration>
<configuration default="false" name="Nosetests in test_pageduration.py" type="tests" factoryName="Nosetests" temporary="true" nameIsGenerated="true"> <configuration default="false" name="Nosetests in test_install.py" type="tests" factoryName="Nosetests" temporary="true" nameIsGenerated="true">
<option name="INTERPRETER_OPTIONS" value="" /> <option name="INTERPRETER_OPTIONS" value="" />
<option name="PARENT_ENVS" value="true" /> <option name="PARENT_ENVS" value="true" />
<envs /> <envs />
...@@ -470,11 +472,11 @@ ...@@ -470,11 +472,11 @@
<EXTENSION ID="PythonCoverageRunConfigurationExtension" enabled="false" runner="coverage.py" /> <EXTENSION ID="PythonCoverageRunConfigurationExtension" enabled="false" runner="coverage.py" />
<option name="_new_regexPattern" value="&quot;&quot;" /> <option name="_new_regexPattern" value="&quot;&quot;" />
<option name="_new_additionalArguments" value="&quot;&quot;" /> <option name="_new_additionalArguments" value="&quot;&quot;" />
<option name="_new_target" value="&quot;$PROJECT_DIR$/testcase/android_events/test_pageduration.py&quot;" /> <option name="_new_target" value="&quot;$PROJECT_DIR$/testcase/android_events/test_install.py&quot;" />
<option name="_new_targetType" value="&quot;PATH&quot;" /> <option name="_new_targetType" value="&quot;PATH&quot;" />
<method /> <method />
</configuration> </configuration>
<configuration default="false" name="Nosetests in test_appduration.py" type="tests" factoryName="Nosetests" temporary="true" nameIsGenerated="true"> <configuration default="false" name="Nosetests for test_install.installTestCase.testinstall" type="tests" factoryName="Nosetests" temporary="true" nameIsGenerated="true">
<option name="INTERPRETER_OPTIONS" value="" /> <option name="INTERPRETER_OPTIONS" value="" />
<option name="PARENT_ENVS" value="true" /> <option name="PARENT_ENVS" value="true" />
<envs /> <envs />
...@@ -487,8 +489,8 @@ ...@@ -487,8 +489,8 @@
<EXTENSION ID="PythonCoverageRunConfigurationExtension" enabled="false" runner="coverage.py" /> <EXTENSION ID="PythonCoverageRunConfigurationExtension" enabled="false" runner="coverage.py" />
<option name="_new_regexPattern" value="&quot;&quot;" /> <option name="_new_regexPattern" value="&quot;&quot;" />
<option name="_new_additionalArguments" value="&quot;&quot;" /> <option name="_new_additionalArguments" value="&quot;&quot;" />
<option name="_new_target" value="&quot;$PROJECT_DIR$/testcase/android_events/test_appduration.py&quot;" /> <option name="_new_target" value="&quot;test_install.installTestCase.testinstall&quot;" />
<option name="_new_targetType" value="&quot;PATH&quot;" /> <option name="_new_targetType" value="&quot;PYTHON&quot;" />
<method /> <method />
</configuration> </configuration>
<configuration default="true" type="DjangoTestsConfigurationType" factoryName="Django tests"> <configuration default="true" type="DjangoTestsConfigurationType" factoryName="Django tests">
...@@ -641,19 +643,19 @@ ...@@ -641,19 +643,19 @@
<method /> <method />
</configuration> </configuration>
<list size="5"> <list size="5">
<item index="0" class="java.lang.String" itemvalue="Python tests.Nosetests in test_adshow.py" /> <item index="0" class="java.lang.String" itemvalue="Python tests.Nosetests in test_batchUpload.py" />
<item index="1" class="java.lang.String" itemvalue="Python tests.Nosetests in test_adclick.py" /> <item index="1" class="java.lang.String" itemvalue="Python tests.Nosetests in tokenTest.py" />
<item index="2" class="java.lang.String" itemvalue="Python tests.Nosetests for test_install.installTestCase.testinstall" /> <item index="2" class="java.lang.String" itemvalue="Python.tokenTest" />
<item index="3" class="java.lang.String" itemvalue="Python tests.Nosetests in test_pageduration.py" /> <item index="3" class="java.lang.String" itemvalue="Python tests.Nosetests in test_install.py" />
<item index="4" class="java.lang.String" itemvalue="Python tests.Nosetests in test_appduration.py" /> <item index="4" class="java.lang.String" itemvalue="Python tests.Nosetests for test_install.installTestCase.testinstall" />
</list> </list>
<recent_temporary> <recent_temporary>
<list size="5"> <list size="5">
<item index="0" class="java.lang.String" itemvalue="Python tests.Nosetests in test_appduration.py" /> <item index="0" class="java.lang.String" itemvalue="Python tests.Nosetests in test_install.py" />
<item index="1" class="java.lang.String" itemvalue="Python tests.Nosetests in test_pageduration.py" /> <item index="1" class="java.lang.String" itemvalue="Python tests.Nosetests for test_install.installTestCase.testinstall" />
<item index="2" class="java.lang.String" itemvalue="Python tests.Nosetests for test_install.installTestCase.testinstall" /> <item index="2" class="java.lang.String" itemvalue="Python.tokenTest" />
<item index="3" class="java.lang.String" itemvalue="Python tests.Nosetests in test_adclick.py" /> <item index="3" class="java.lang.String" itemvalue="Python tests.Nosetests in tokenTest.py" />
<item index="4" class="java.lang.String" itemvalue="Python tests.Nosetests in test_adshow.py" /> <item index="4" class="java.lang.String" itemvalue="Python tests.Nosetests in test_batchUpload.py" />
</list> </list>
</recent_temporary> </recent_temporary>
</component> </component>
...@@ -924,39 +926,46 @@ ...@@ -924,39 +926,46 @@
<option name="project" value="LOCAL" /> <option name="project" value="LOCAL" />
<updated>1598259165042</updated> <updated>1598259165042</updated>
</task> </task>
<option name="localTasksCounter" value="37" /> <task id="LOCAL-00037" summary="update">
<created>1598324138933</created>
<option name="number" value="00037" />
<option name="presentableId" value="LOCAL-00037" />
<option name="project" value="LOCAL" />
<updated>1598324138933</updated>
</task>
<option name="localTasksCounter" value="38" />
<servers /> <servers />
</component> </component>
<component name="TestHistory"> <component name="TestHistory">
<history-entry file="Nosetests_for_test_install_installTestCase_testinstall - 2020.08.24 at 16h 38m 53s.xml"> <history-entry file="Nosetests_for_test_install_installTestCase_testinstall - 2020.08.27 at 17h 05m 35s.xml">
<configuration name="Nosetests for test_install.installTestCase.testinstall" configurationId="tests" /> <configuration name="Nosetests for test_install.installTestCase.testinstall" configurationId="tests" />
</history-entry> </history-entry>
<history-entry file="Nosetests_in_test_adclick_py - 2020.08.24 at 16h 02m 01s.xml"> <history-entry file="Nosetests_in_test_install_py - 2020.08.27 at 17h 04m 19s.xml">
<configuration name="Nosetests in test_adclick.py" configurationId="tests" /> <configuration name="Nosetests in test_install.py" configurationId="tests" />
</history-entry> </history-entry>
<history-entry file="Nosetests_in_test_adclick_py - 2020.08.24 at 16h 36m 57s.xml"> <history-entry file="Nosetests_in_test_install_py - 2020.08.27 at 17h 06m 18s.xml">
<configuration name="Nosetests in test_adclick.py" configurationId="tests" /> <configuration name="Nosetests in test_install.py" configurationId="tests" />
</history-entry> </history-entry>
<history-entry file="Nosetests_in_test_adshow_py - 2020.08.21 at 18h 02m 43s.xml"> <history-entry file="Nosetests_in_test_install_py - 2020.08.27 at 17h 06m 46s.xml">
<configuration name="Nosetests in test_adshow.py" configurationId="tests" /> <configuration name="Nosetests in test_install.py" configurationId="tests" />
</history-entry> </history-entry>
<history-entry file="Nosetests_in_test_adshow_py - 2020.08.21 at 18h 04m 36s.xml"> <history-entry file="Nosetests_in_test_install_py - 2020.08.27 at 17h 07m 41s.xml">
<configuration name="Nosetests in test_adshow.py" configurationId="tests" /> <configuration name="Nosetests in test_install.py" configurationId="tests" />
</history-entry> </history-entry>
<history-entry file="Nosetests_in_test_appduration_py - 2020.08.24 at 20h 25m 37s.xml"> <history-entry file="Nosetests_in_test_install_py - 2020.08.27 at 17h 08m 50s.xml">
<configuration name="Nosetests in test_appduration.py" configurationId="tests" /> <configuration name="Nosetests in test_install.py" configurationId="tests" />
</history-entry> </history-entry>
<history-entry file="Nosetests_in_test_custom_py - 2020.08.21 at 16h 49m 16s.xml"> <history-entry file="Nosetests_in_test_install_py - 2020.08.27 at 17h 09m 59s.xml">
<configuration name="Nosetests in test_custom.py" configurationId="tests" /> <configuration name="Nosetests in test_install.py" configurationId="tests" />
</history-entry> </history-entry>
<history-entry file="Nosetests_in_test_custom_py - 2020.08.21 at 16h 49m 44s.xml"> <history-entry file="Nosetests_in_test_install_py - 2020.08.27 at 17h 13m 18s.xml">
<configuration name="Nosetests in test_custom.py" configurationId="tests" /> <configuration name="Nosetests in test_install.py" configurationId="tests" />
</history-entry> </history-entry>
<history-entry file="Nosetests_in_test_custom_py - 2020.08.21 at 16h 50m 03s.xml"> <history-entry file="Nosetests_in_test_install_py - 2020.08.27 at 17h 13m 46s.xml">
<configuration name="Nosetests in test_custom.py" configurationId="tests" /> <configuration name="Nosetests in test_install.py" configurationId="tests" />
</history-entry> </history-entry>
<history-entry file="Nosetests_in_test_pageduration_py - 2020.08.24 at 18h 26m 02s.xml"> <history-entry file="Nosetests_in_test_install_py - 2020.08.27 at 17h 23m 51s.xml">
<configuration name="Nosetests in test_pageduration.py" configurationId="tests" /> <configuration name="Nosetests in test_install.py" configurationId="tests" />
</history-entry> </history-entry>
</component> </component>
<component name="TodoView"> <component name="TodoView">
...@@ -972,16 +981,15 @@ ...@@ -972,16 +981,15 @@
<frame x="0" y="23" width="1280" height="724" extended-state="0" /> <frame x="0" y="23" width="1280" height="724" extended-state="0" />
<editor active="true" /> <editor active="true" />
<layout> <layout>
<window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.2092084" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
<window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32838285" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" /> <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32838285" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
<window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32838285" sideWeight="0.5072698" order="7" side_tool="true" content_ui="tabs" /> <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32838285" sideWeight="0.5072698" order="7" side_tool="true" content_ui="tabs" />
<window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.32838285" sideWeight="0.4927302" order="2" side_tool="false" content_ui="tabs" /> <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32956383" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
<window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32838285" sideWeight="0.4927302" order="2" side_tool="false" content_ui="tabs" />
<window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32838285" sideWeight="0.5" order="10" side_tool="false" content_ui="tabs" /> <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32838285" sideWeight="0.5" order="10" side_tool="false" content_ui="tabs" />
<window_info id="Python Console" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32838285" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" /> <window_info id="Python Console" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32838285" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
<window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32838285" sideWeight="0.4951535" order="9" side_tool="false" content_ui="tabs" />
<window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.20597738" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
<window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32956383" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
<window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32838285" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" /> <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32838285" sideWeight="0.4951535" order="9" side_tool="false" content_ui="tabs" />
<window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.39933994" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" /> <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.39933994" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
<window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" /> <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />
<window_info id="Data View" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32956383" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" /> <window_info id="Data View" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32956383" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
...@@ -990,6 +998,7 @@ ...@@ -990,6 +998,7 @@
<window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" /> <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
<window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" /> <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
<window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" /> <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
<window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32838285" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" /> <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
</layout> </layout>
</component> </component>
...@@ -1015,31 +1024,10 @@ ...@@ -1015,31 +1024,10 @@
<watches-manager /> <watches-manager />
</component> </component>
<component name="editorHistoryManager"> <component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/config/envcfg.py">
<provider selected="true" editor-type-id="text-editor">
<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" />
<folding>
<element signature="e#98#120#0" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/config/prod/params.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="480">
<caret line="32" column="9" lean-forward="false" selection-start-line="32" selection-start-column="9" selection-end-line="32" selection-end-column="9" />
<folding>
<element signature="e#97#108#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/data/prod.yaml"> <entry file="file://$PROJECT_DIR$/data/prod.yaml">
<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="15" column="31" lean-forward="true" selection-start-line="15" selection-start-column="31" selection-end-line="15" selection-end-column="31" /> <caret line="15" column="31" lean-forward="true" selection-start-line="15" selection-start-column="31" selection-end-line="15" selection-end-column="31" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -1047,9 +1035,6 @@ ...@@ -1047,9 +1035,6 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="285"> <state relative-caret-position="285">
<caret line="27" column="13" lean-forward="true" selection-start-line="24" selection-start-column="7" selection-end-line="27" selection-end-column="13" /> <caret line="27" column="13" lean-forward="true" selection-start-line="24" selection-start-column="7" selection-end-line="27" selection-end-column="13" />
<folding>
<element signature="e#109#118#0" expanded="false" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -1057,9 +1042,6 @@ ...@@ -1057,9 +1042,6 @@
<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="15" column="9" lean-forward="true" selection-start-line="15" selection-start-column="9" selection-end-line="15" selection-end-column="9" /> <caret line="15" column="9" lean-forward="true" selection-start-line="15" selection-start-column="9" selection-end-line="15" selection-end-column="9" />
<folding>
<element signature="e#100#115#0" expanded="false" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -1067,9 +1049,6 @@ ...@@ -1067,9 +1049,6 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="7260"> <state relative-caret-position="7260">
<caret line="487" column="13" lean-forward="false" selection-start-line="487" selection-start-column="13" selection-end-line="487" selection-end-column="13" /> <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>
<element signature="e#99#114#0" expanded="false" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -1078,9 +1057,7 @@ ...@@ -1078,9 +1057,7 @@
<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">
<caret line="22" column="16" lean-forward="false" selection-start-line="22" selection-start-column="16" selection-end-line="22" selection-end-column="16" /> <caret line="22" column="16" lean-forward="false" selection-start-line="22" selection-start-column="16" selection-end-line="22" selection-end-column="16" />
<folding> <folding />
<element signature="e#100#113#0" expanded="false" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -1088,9 +1065,7 @@ ...@@ -1088,9 +1065,7 @@
<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="false" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -1108,9 +1083,7 @@ ...@@ -1108,9 +1083,7 @@
<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="false" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -1118,7 +1091,6 @@ ...@@ -1118,7 +1091,6 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="30"> <state relative-caret-position="30">
<caret line="2" column="25" lean-forward="false" selection-start-line="2" selection-start-column="25" selection-end-line="2" selection-end-column="25" /> <caret line="2" column="25" lean-forward="false" selection-start-line="2" selection-start-column="25" selection-end-line="2" selection-end-column="25" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -1126,9 +1098,6 @@ ...@@ -1126,9 +1098,6 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1110"> <state relative-caret-position="1110">
<caret line="74" column="13" lean-forward="false" selection-start-line="74" selection-start-column="13" selection-end-line="74" selection-end-column="13" /> <caret line="74" column="13" lean-forward="false" selection-start-line="74" selection-start-column="13" selection-end-line="74" selection-end-column="13" />
<folding>
<element signature="e#109#118#0" expanded="false" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -1143,7 +1112,6 @@ ...@@ -1143,7 +1112,6 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="30"> <state relative-caret-position="30">
<caret line="2" column="25" lean-forward="false" selection-start-line="2" selection-start-column="25" selection-end-line="2" selection-end-column="25" /> <caret line="2" column="25" lean-forward="false" selection-start-line="2" selection-start-column="25" selection-end-line="2" selection-end-column="25" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -1151,9 +1119,6 @@ ...@@ -1151,9 +1119,6 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1110"> <state relative-caret-position="1110">
<caret line="74" column="13" lean-forward="true" selection-start-line="74" selection-start-column="13" selection-end-line="74" selection-end-column="13" /> <caret line="74" column="13" lean-forward="true" selection-start-line="74" selection-start-column="13" selection-end-line="74" selection-end-column="13" />
<folding>
<element signature="e#109#118#0" expanded="false" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -1222,7 +1187,6 @@ ...@@ -1222,7 +1187,6 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0"> <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" /> <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 />
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -1230,7 +1194,6 @@ ...@@ -1230,7 +1194,6 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0"> <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" /> <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 />
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -1238,7 +1201,6 @@ ...@@ -1238,7 +1201,6 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="165"> <state relative-caret-position="165">
<caret line="11" column="6" lean-forward="false" selection-start-line="11" selection-start-column="6" selection-end-line="11" selection-end-column="6" /> <caret line="11" column="6" lean-forward="false" selection-start-line="11" selection-start-column="6" selection-end-line="11" selection-end-column="6" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -1246,7 +1208,6 @@ ...@@ -1246,7 +1208,6 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="255"> <state relative-caret-position="255">
<caret line="17" column="0" lean-forward="false" selection-start-line="17" selection-start-column="0" selection-end-line="17" selection-end-column="0" /> <caret line="17" column="0" lean-forward="false" selection-start-line="17" selection-start-column="0" selection-end-line="17" selection-end-column="0" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -1254,7 +1215,6 @@ ...@@ -1254,7 +1215,6 @@
<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="15" column="31" lean-forward="false" selection-start-line="15" selection-start-column="31" selection-end-line="15" selection-end-column="31" /> <caret line="15" column="31" lean-forward="false" selection-start-line="15" selection-start-column="31" selection-end-line="15" selection-end-column="31" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -1262,9 +1222,6 @@ ...@@ -1262,9 +1222,6 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="589"> <state relative-caret-position="589">
<caret line="109" column="0" lean-forward="false" selection-start-line="109" selection-start-column="0" selection-end-line="109" selection-end-column="0" /> <caret line="109" column="0" lean-forward="false" selection-start-line="109" selection-start-column="0" selection-end-line="109" selection-end-column="0" />
<folding>
<element signature="e#109#118#0" expanded="false" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -1272,15 +1229,6 @@ ...@@ -1272,15 +1229,6 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="775"> <state relative-caret-position="775">
<caret line="62" column="0" lean-forward="false" selection-start-line="62" selection-start-column="0" selection-end-line="62" selection-end-column="0" /> <caret line="62" column="0" lean-forward="false" selection-start-line="62" selection-start-column="0" selection-end-line="62" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/testcase/android_events/__init__.py">
<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 />
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -1288,7 +1236,6 @@ ...@@ -1288,7 +1236,6 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="72"> <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" /> <caret line="376" column="6" lean-forward="false" selection-start-line="376" selection-start-column="6" selection-end-line="376" selection-end-column="6" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -1296,17 +1243,6 @@ ...@@ -1296,17 +1243,6 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="978"> <state relative-caret-position="978">
<caret line="402" column="6" lean-forward="false" selection-start-line="402" selection-start-column="6" selection-end-line="402" selection-end-column="6" /> <caret line="402" column="6" lean-forward="false" selection-start-line="402" selection-start-column="6" selection-end-line="402" selection-end-column="6" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/config/envcfg.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="24">
<caret line="12" column="6" lean-forward="false" selection-start-line="12" selection-start-column="6" selection-end-line="12" selection-end-column="6" />
<folding>
<element signature="e#98#120#0" expanded="false" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -1322,122 +1258,140 @@ ...@@ -1322,122 +1258,140 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="352"> <state relative-caret-position="352">
<caret line="487" column="13" lean-forward="false" selection-start-line="487" selection-start-column="13" selection-end-line="487" selection-end-column="13" /> <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> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/testcase/android_events/test_adclick.py"> <entry file="file://$PROJECT_DIR$/testcase/android_events/test_payment.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="315"> <state relative-caret-position="322">
<caret line="24" column="19" lean-forward="false" selection-start-line="24" selection-start-column="19" selection-end-line="24" selection-end-column="19" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/testcase/android_events/test_payorder.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="268">
<caret line="21" column="19" lean-forward="false" selection-start-line="21" selection-start-column="19" selection-end-line="21" selection-end-column="19" /> <caret line="21" column="19" lean-forward="false" selection-start-line="21" selection-start-column="19" selection-end-line="21" selection-end-column="19" />
<folding>
<element signature="e#103#118#0" expanded="false" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/testcase/android_events/test_install.py"> <entry file="file://$PROJECT_DIR$/testcase/android_events/test_register.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="238"> <state relative-caret-position="313">
<caret line="21" column="0" lean-forward="false" selection-start-line="21" selection-start-column="0" selection-end-line="22" selection-end-column="19" /> <caret line="23" column="19" lean-forward="false" selection-start-line="23" selection-start-column="19" selection-end-line="23" selection-end-column="19" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/testcase/android_events/test_payment.py"> <entry file="file://$PROJECT_DIR$/testcase/android_events/test_login.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="322"> <state relative-caret-position="297">
<caret line="24" column="19" lean-forward="false" selection-start-line="24" selection-start-column="19" selection-end-line="24" selection-end-column="19" /> <caret line="20" column="0" lean-forward="false" selection-start-line="20" selection-start-column="0" selection-end-line="21" selection-end-column="19" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/testcase/android_events/test_adshow.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="300">
<caret line="20" column="26" lean-forward="true" selection-start-line="20" selection-start-column="26" selection-end-line="20" selection-end-column="26" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/testcase/android_events/test_pageduration.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="135">
<caret line="9" column="0" lean-forward="false" selection-start-line="9" selection-start-column="0" selection-end-line="22" selection-end-column="19" />
<folding> <folding>
<element signature="e#103#118#0" expanded="true" /> <element signature="e#109#124#0" expanded="true" />
</folding> </folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/testcase/android_events/test_payorder.py"> <entry file="file://$PROJECT_DIR$/testcase/android_events/test_appduration.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="268"> <state relative-caret-position="165">
<caret line="21" column="19" lean-forward="false" selection-start-line="21" selection-start-column="19" selection-end-line="21" selection-end-column="19" /> <caret line="15" column="45" lean-forward="false" selection-start-line="15" selection-start-column="45" selection-end-line="15" selection-end-column="45" />
<folding> <folding>
<element signature="e#104#119#0" expanded="true" /> <element signature="e#107#122#0" expanded="true" />
</folding> </folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/testcase/android_events/test_register.py"> <entry file="file://$PROJECT_DIR$/testcase/android_events/test_custom.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="313"> <state relative-caret-position="120">
<caret line="23" column="19" lean-forward="false" selection-start-line="23" selection-start-column="19" selection-end-line="23" selection-end-column="19" /> <caret line="8" column="0" lean-forward="false" selection-start-line="8" selection-start-column="0" selection-end-line="12" selection-end-column="44" />
<folding> <folding>
<element signature="e#121#136#0" expanded="true" /> <element signature="e#102#117#0" expanded="true" />
</folding> </folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/testcase/android_events/test_startup.py"> <entry file="file://$PROJECT_DIR$/testcase/android_events/__init__.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="255"> <state relative-caret-position="0">
<caret line="21" column="19" lean-forward="true" selection-start-line="21" selection-start-column="19" selection-end-line="21" selection-end-column="19" /> <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 /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/testcase/android_events/test_login.py"> <entry file="file://$PROJECT_DIR$/testcase/android_events/test_adclick.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="297"> <state relative-caret-position="240">
<caret line="20" column="0" lean-forward="false" selection-start-line="20" selection-start-column="0" selection-end-line="21" selection-end-column="19" /> <caret line="20" column="26" lean-forward="false" selection-start-line="20" selection-start-column="26" selection-end-line="20" selection-end-column="26" />
<folding> <folding />
<element signature="e#101#116#0" expanded="true" />
</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_batchUpload.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="44"> <state relative-caret-position="105">
<caret line="348" column="7" lean-forward="false" selection-start-line="348" selection-start-column="7" selection-end-line="348" selection-end-column="18" /> <caret line="7" column="0" lean-forward="false" selection-start-line="7" selection-start-column="0" selection-end-line="7" selection-end-column="0" />
<folding> <folding>
<element signature="e#97#108#0" expanded="true" /> <element signature="e#108#123#0" expanded="true" />
</folding> </folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/testcase/android_events/test_adshow.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="300"> <state relative-caret-position="300">
<caret line="20" column="26" lean-forward="true" selection-start-line="20" selection-start-column="26" selection-end-line="20" selection-end-column="26" /> <caret line="23" column="38" lean-forward="false" selection-start-line="23" selection-start-column="38" selection-end-line="23" selection-end-column="38" />
<folding> <folding />
<element signature="e#102#117#0" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/testcase/android_events/test_custom.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="313"> <state relative-caret-position="120">
<caret line="21" column="19" lean-forward="false" selection-start-line="21" selection-start-column="19" selection-end-line="21" selection-end-column="19" /> <caret line="12" column="0" lean-forward="false" selection-start-line="12" selection-start-column="0" selection-end-line="12" selection-end-column="0" />
<folding> <folding />
<element signature="e#102#117#0" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/testcase/android_events/test_pageduration.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="73"> <state relative-caret-position="150">
<caret line="9" column="0" lean-forward="false" selection-start-line="9" selection-start-column="0" selection-end-line="22" selection-end-column="19" /> <caret line="10" column="29" lean-forward="false" selection-start-line="10" selection-start-column="29" selection-end-line="10" selection-end-column="29" />
<folding> <folding>
<element signature="e#109#124#0" expanded="true" /> <element signature="e#97#108#0" expanded="true" />
</folding> </folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/testcase/android_events/test_appduration.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="180"> <state relative-caret-position="120">
<caret line="12" column="49" lean-forward="true" selection-start-line="12" selection-start-column="49" selection-end-line="12" selection-end-column="49" /> <caret line="12" column="45" lean-forward="true" selection-start-line="12" selection-start-column="45" selection-end-line="12" selection-end-column="45" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/testcase/android_events/tokenTest.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="315">
<caret line="21" column="13" lean-forward="true" selection-start-line="21" selection-start-column="13" selection-end-line="21" selection-end-column="13" />
<folding> <folding>
<element signature="e#107#122#0" expanded="true" /> <element signature="e#100#115#0" expanded="true" />
</folding> </folding>
</state> </state>
</provider> </provider>
......
...@@ -19,8 +19,10 @@ prod = { ...@@ -19,8 +19,10 @@ prod = {
"appkey": "9b17c1568c3ce34599c5fd2778483ff9" "appkey": "9b17c1568c3ce34599c5fd2778483ff9"
}, },
"events": { "events": {
"url": "http://tlog.trackingio.com/receive/tkio/", # "url": "http://tlog.trackingio.com/receive/tkio/",
"appkey": "9b17c1568c3ce34599c5fd2778483ff9", "url": "http://10.3.20.42:8080",
"interface": "/receive/tkiov2/install",
"appkey": "b58f29d64718c6723895cb8a2389258c",
}, },
} }
......
...@@ -84,6 +84,7 @@ params_install = { ...@@ -84,6 +84,7 @@ params_install = {
"_istablet": "phone", "_istablet": "phone",
"_lib": "Android", "_lib": "Android",
"_lib_version": "1.5.0", "_lib_version": "1.5.0",
"X-RY-Access-Token": "4131e3fee2034592b3d355611e7d71ae"
}, },
# 'when': time.strftime('%Y-%m-%d %H:%M:%S', time.localtime(time.time())), # 'when': time.strftime('%Y-%m-%d %H:%M:%S', time.localtime(time.time())),
# time.strftime('%Y-%m-%d %H:%M:%S', time.localtime(time.time())) # time.strftime('%Y-%m-%d %H:%M:%S', time.localtime(time.time()))
...@@ -373,4 +374,108 @@ params_appduration = { ...@@ -373,4 +374,108 @@ params_appduration = {
# 'when': time.strftime('%Y-%m-%d %H:%M:%S', time.localtime(time.time())), # 'when': time.strftime('%Y-%m-%d %H:%M:%S', time.localtime(time.time())),
# 'ds': ds, # 'ds': ds,
'who': 'lxx_test' 'who': 'lxx_test'
}
params_batchUpload1 = {
"from": "tkio", "data": [
{"appid": prod['events']['appkey'],
"when": "2018-01-08 11:22:42",
"what": "startup",
"context": {"_manufacturer": "苹果",
"_carrier": "unknown",
"_lats": "1",
"_jbk": "1",
"_app_version": "1.0",
"_timestamp": "1515381771925",
"_create_timestamp": "1515381762624",
"_rydevicetype": "iPhone",
"_deviceid": "FD8A5386-C25B-49D8-A0F3-2E61B179DA0E",
"_tz": "+8",
"_resolution": "667*375",
"_pkgname": "com.reyun.testapp",
"_mac": "80:E6:50:12:4C:DE",
"_network_type": "NO CONNECT",
"_istf": "8",
"_idfv": "27CCEE6E-5ED1-47EC-B486-81F9129C05D3",
"_ryosversion": "11.2",
"_model": "iPhone Simulator",
"_lib_version": "2.0.0",
"_ryos": "ios",
"_campaignid": "channelid",
"_idfa": "FD8A5386-C25B-49D8-A0F3-2E61B179DA0E"},
"who": "unknown"},
{"appid": prod['events']['appkey'],
"when": "2018-01-08 11:22:42",
"what": "register",
"context": {"_manufacturer": "苹果",
"_carrier": "unknown",
"_lats": "1",
"_jbk": "1",
"_app_version": "1.0",
"_timestamp": "1515381771925",
"_create_timestamp": "1515381762657",
"_rydevicetype": "iPhone",
"_deviceid": "FD8A5386-C25B-49D8-A0F3-2E61B179DA0E",
"_tz": "+8",
"_resolution": "667*375",
"_pkgname": "com.reyun.testapp",
"_mac": "80:E6:50:12:4C:DE",
"_network_type": "NO CONNECT",
"_istf": "8",
"_idfv": "27CCEE6E-5ED1-47EC-B486-81F9129C05D3",
"_ryosversion": "11.2",
"_model": "iPhone Simulator",
"_lib_version": "2.0.0",
"_ryos": "ios",
"_campaignid": "channelid",
"_idfa": "FD8A5386-C25B-49D8-A0F3-2E61B179DA0E"},
"who": "acc1"}],
}
params_batchUpload = {
"from": "tkio", "data": [
{"appid": prod['events']['appkey'], "when": "2018-01-08 11:22:42", "what": "startup",
"context": {"_manufacturer": "苹果", "_carrier": "unknown", "_lats": "1", "_jbk": "1",
"_app_version": "1.0", "_timestamp": "1515381771925", "_create_timestamp": "1515381762624",
"_rydevicetype": "iPhone", "_deviceid": "FD8A5386-C25B-49D8-A0F3-2E61B179DA0E",
"_tz": "+8", "_resolution": "667*375", "_pkgname": "com.reyun.testapp",
"_mac": "80:E6:50:12:4C:DE", "_network_type": "NO CONNECT", "_istf": "8",
"_idfv": "27CCEE6E-5ED1-47EC-B486-81F9129C05D3", "_ryosversion": "11.2",
"_model": "iPhone Simulator", "_lib_version": "2.0.0", "_ryos": "ios",
"_campaignid": "channelid", "_idfa": "FD8A5386-C25B-49D8-A0F3-2E61B179DA0E"},
"who": "unknown"},
{"appid": prod['events']['appkey'], "when": "2018-01-08 11:22:42", "what": "register",
"context": {"_manufacturer": "苹果", "_carrier": "unknown", "_lats": "1", "_jbk": "1",
"_app_version": "1.0", "_timestamp": "1515381771925", "_create_timestamp": "1515381762657",
"_rydevicetype": "iPhone", "_deviceid": "FD8A5386-C25B-49D8-A0F3-2E61B179DA0E",
"_tz": "+8", "_resolution": "667*375", "_pkgname": "com.reyun.testapp",
"_mac": "80:E6:50:12:4C:DE", "_network_type": "NO CONNECT", "_istf": "8",
"_idfv": "27CCEE6E-5ED1-47EC-B486-81F9129C05D3", "_ryosversion": "11.2",
"_model": "iPhone Simulator", "_lib_version": "2.0.0", "_ryos": "ios",
"_campaignid": "channelid", "_idfa": "FD8A5386-C25B-49D8-A0F3-2E61B179DA0E"},
"who": "acc1"},
]
}
params_h5 = {
"what": "download",
"appType": "wap",
"appid": prod['events']['appkey'],
"context": {
"_campaignid": "_default_",
"_deviceid": randomUtil.r.randimei(),
"_cid": "-1",
"_ry_ts": "1588130655311",
"_tz": "+8",
"_ip": randomUtil.r.randip(),
"_apptype": "wap",
"_campaignid_bak": "_default_",
"_ua": "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_12_3) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/79.0.3945.88 Safari/537.36",
"_cid_bak": "-1"
},
"where": "event",
"deviceid": randomUtil.r.randimei(),
"when": time.strftime('%Y-%m-%d %H:%M:%S', time.localtime(time.time())),
"ds": time.strftime('%Y-%m-%d', time.localtime(time.time())),
"who": "552317006484"
} }
\ No newline at end of file
# -*- coding: utf-8 -*-
"""
@author:zhaiht
@file: test_batchUpload.py
@time: 2020/8/25 15:24
@desc:
"""
import unittest
import json
import requests
from config.envcfg import prod, headers
from config.prod.params import params_batchUpload
class batchUploadTestCase(unittest.TestCase):
def testbatchUpload(self):
p = requests.post(url=prod['events']['url'], data=json.dumps(params_batchUpload), headers=headers, timeout=5)
print("自定义" + p.text)
...@@ -14,10 +14,10 @@ from config.prod.params import params_install ...@@ -14,10 +14,10 @@ from config.prod.params import params_install
class installTestCase(unittest.TestCase): class installTestCase(unittest.TestCase):
def testinstall(self): def testinstall(self):
r = requests.post(url=prod["events"]["url"] + 'install', data=json.dumps(params_install), headers=headers) r = requests.post(url=prod["events"]["url"] + prod['events']['interface'], data=json.dumps(params_install), headers=headers)
print("激活事件执行结果:" + r.text) print("\n激活事件执行结果:" + r.text)
print(r.url) print(r.url)
self.assertEqual(r.status_code, 200, msg="执行失败,请检查") #self.assertEqual(r.status_code, 200, msg="执行失败,请检查")
if __name__ == "__main__": if __name__ == "__main__":
unittest.main() unittest.main()
# -*- coding: utf-8 -*-
"""
@author:zhaiht
@file: tokenTest.py
@time: 2020/8/27 16:36
@desc:
"""
import requests
import json
URL = 'http://10.3.20.41:9003/api/tkio/authorization_token'
headers = {'Content-Type': 'application/json'}
params_token = {
"appid": "03cca1a7459b7794147f0f94cbbdbd9f",
"appsecret": "1B05F022413F180F53CC21B6C4579D37"
}
r = requests.post(url=URL, data=json.dumps(params_token), headers=headers, timeout=10)
print(r.text)
\ 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