Commit 847d7c93 by zhaihuitao

update

parent 9a878286
...@@ -2,12 +2,9 @@ ...@@ -2,12 +2,9 @@
<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_batchUpload.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/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$/testcase/android_events/test_adclick.py" afterPath="$PROJECT_DIR$/testcase/android_events/test_adclick.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" />
...@@ -34,7 +31,7 @@ ...@@ -34,7 +31,7 @@
<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="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/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="1598607297129" 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" />
<SUITE FILE_PATH="coverage/trackingIO$Nosetests_for_test_click_clickTestCase.coverage" NAME="Nosetests for test_click.clickTestCase Coverage Results" MODIFIED="1596792693473" 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_click_clickTestCase.coverage" NAME="Nosetests for test_click.clickTestCase Coverage Results" MODIFIED="1596792693473" 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_click_clickTestCase_click.coverage" NAME="Nosetests for test_click.clickTestCase.click Coverage Results" MODIFIED="1597028770011" 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_click_clickTestCase_click.coverage" NAME="Nosetests for test_click.clickTestCase.click Coverage Results" MODIFIED="1597028770011" 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" />
...@@ -63,7 +60,7 @@ ...@@ -63,7 +60,7 @@
<file leaf-file-name="params.py" pinned="false" current-in-tab="false"> <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="150"> <state relative-caret-position="-18">
<caret line="10" column="29" lean-forward="false" selection-start-line="10" selection-start-column="29" selection-end-line="10" selection-end-column="29" /> <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#97#108#0" expanded="true" /> <element signature="e#97#108#0" expanded="true" />
...@@ -82,11 +79,11 @@ ...@@ -82,11 +79,11 @@
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="tokenTest.py" pinned="false" current-in-tab="true"> <file leaf-file-name="tokenTest.py" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/testcase/android_events/tokenTest.py"> <entry file="file://$PROJECT_DIR$/testcase/android_events/tokenTest.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="315"> <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" /> <caret line="21" column="13" lean-forward="false" selection-start-line="21" selection-start-column="12" selection-end-line="21" selection-end-column="13" />
<folding> <folding>
<element signature="e#100#115#0" expanded="true" /> <element signature="e#100#115#0" expanded="true" />
</folding> </folding>
...@@ -129,8 +126,18 @@ ...@@ -129,8 +126,18 @@
<file leaf-file-name="test_adclick.py" pinned="false" current-in-tab="false"> <file leaf-file-name="test_adclick.py" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/testcase/android_events/test_adclick.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="240"> <state relative-caret-position="255">
<caret line="20" column="26" lean-forward="false" selection-start-line="20" selection-start-column="26" selection-end-line="20" selection-end-column="26" /> <caret line="21" column="19" lean-forward="true" selection-start-line="21" selection-start-column="19" selection-end-line="21" selection-end-column="19" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="models.py" pinned="false" current-in-tab="false">
<entry file="file:///anaconda3/lib/python3.6/site-packages/requests/models.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="127">
<caret line="372" column="0" lean-forward="false" selection-start-line="372" selection-start-column="0" selection-end-line="372" selection-end-column="0" />
<folding /> <folding />
</state> </state>
</provider> </provider>
...@@ -148,28 +155,16 @@ ...@@ -148,28 +155,16 @@
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="envcfg.py" pinned="false" current-in-tab="false"> <file leaf-file-name="envcfg.py" pinned="false" current-in-tab="true">
<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="300"> <state relative-caret-position="131">
<caret line="23" column="38" lean-forward="false" selection-start-line="23" selection-start-column="38" selection-end-line="23" selection-end-column="38" /> <caret line="25" column="28" lean-forward="false" selection-start-line="25" selection-start-column="28" selection-end-line="25" selection-end-column="28" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="test_appduration.py" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/testcase/android_events/test_appduration.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="165">
<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>
<element signature="e#107#122#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
</leaf> </leaf>
</component> </component>
<component name="FileTemplateManagerImpl"> <component name="FileTemplateManagerImpl">
...@@ -218,12 +213,12 @@ ...@@ -218,12 +213,12 @@
<option value="$PROJECT_DIR$/testcase/android_events/test_pageduration.py" /> <option value="$PROJECT_DIR$/testcase/android_events/test_pageduration.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_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/test_token.py" />
<option value="$PROJECT_DIR$/testcase/android_events/tokenTest.py" /> <option value="$PROJECT_DIR$/testcase/android_events/tokenTest.py" />
<option value="$PROJECT_DIR$/config/envcfg.py" />
<option value="$PROJECT_DIR$/testcase/android_events/test_install.py" /> <option value="$PROJECT_DIR$/testcase/android_events/test_install.py" />
<option value="$PROJECT_DIR$/config/prod/params.py" /> <option value="$PROJECT_DIR$/config/prod/params.py" />
<option value="$PROJECT_DIR$/config/envcfg.py" />
<option value="$PROJECT_DIR$/testcase/android_events/test_adclick.py" />
</list> </list>
</option> </option>
</component> </component>
...@@ -405,24 +400,7 @@ ...@@ -405,24 +400,7 @@
</list> </list>
</option> </option>
</component> </component>
<component name="RunManager" selected="Python tests.Nosetests in test_install.py"> <component name="RunManager" selected="Python tests.Nosetests in test_adclick.py">
<configuration default="false" name="Nosetests in test_batchUpload.py" type="tests" factoryName="Nosetests" temporary="true" nameIsGenerated="true">
<option name="INTERPRETER_OPTIONS" value="" />
<option name="PARENT_ENVS" value="true" />
<envs />
<option name="SDK_HOME" value="" />
<option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/testcase/android_events" />
<option name="IS_MODULE_SDK" value="false" />
<option name="ADD_CONTENT_ROOTS" value="true" />
<option name="ADD_SOURCE_ROOTS" value="true" />
<module name="trackingIO" />
<EXTENSION ID="PythonCoverageRunConfigurationExtension" enabled="false" runner="coverage.py" />
<option name="_new_regexPattern" value="&quot;&quot;" />
<option name="_new_additionalArguments" value="&quot;&quot;" />
<option name="_new_target" value="&quot;$PROJECT_DIR$/testcase/android_events/test_batchUpload.py&quot;" />
<option name="_new_targetType" value="&quot;PATH&quot;" />
<method />
</configuration>
<configuration default="false" name="Nosetests in tokenTest.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" />
...@@ -493,6 +471,23 @@ ...@@ -493,6 +471,23 @@
<option name="_new_targetType" value="&quot;PYTHON&quot;" /> <option name="_new_targetType" value="&quot;PYTHON&quot;" />
<method /> <method />
</configuration> </configuration>
<configuration default="false" name="Nosetests in test_adclick.py" type="tests" factoryName="Nosetests" temporary="true" nameIsGenerated="true">
<option name="INTERPRETER_OPTIONS" value="" />
<option name="PARENT_ENVS" value="true" />
<envs />
<option name="SDK_HOME" value="" />
<option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/testcase/android_events" />
<option name="IS_MODULE_SDK" value="false" />
<option name="ADD_CONTENT_ROOTS" value="true" />
<option name="ADD_SOURCE_ROOTS" value="true" />
<module name="trackingIO" />
<EXTENSION ID="PythonCoverageRunConfigurationExtension" enabled="false" runner="coverage.py" />
<option name="_new_regexPattern" 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_targetType" value="&quot;PATH&quot;" />
<method />
</configuration>
<configuration default="true" type="DjangoTestsConfigurationType" factoryName="Django tests"> <configuration default="true" type="DjangoTestsConfigurationType" factoryName="Django tests">
<option name="INTERPRETER_OPTIONS" value="" /> <option name="INTERPRETER_OPTIONS" value="" />
<option name="PARENT_ENVS" value="true" /> <option name="PARENT_ENVS" value="true" />
...@@ -643,19 +638,19 @@ ...@@ -643,19 +638,19 @@
<method /> <method />
</configuration> </configuration>
<list size="5"> <list size="5">
<item index="0" class="java.lang.String" itemvalue="Python tests.Nosetests in test_batchUpload.py" /> <item index="0" class="java.lang.String" itemvalue="Python tests.Nosetests in tokenTest.py" />
<item index="1" class="java.lang.String" itemvalue="Python tests.Nosetests in tokenTest.py" /> <item index="1" class="java.lang.String" itemvalue="Python.tokenTest" />
<item index="2" class="java.lang.String" itemvalue="Python.tokenTest" /> <item index="2" class="java.lang.String" itemvalue="Python tests.Nosetests in test_install.py" />
<item index="3" class="java.lang.String" itemvalue="Python tests.Nosetests in test_install.py" /> <item index="3" class="java.lang.String" itemvalue="Python tests.Nosetests for test_install.installTestCase.testinstall" />
<item index="4" class="java.lang.String" itemvalue="Python tests.Nosetests for test_install.installTestCase.testinstall" /> <item index="4" class="java.lang.String" itemvalue="Python tests.Nosetests in test_adclick.py" />
</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_install.py" /> <item index="0" class="java.lang.String" itemvalue="Python tests.Nosetests in test_adclick.py" />
<item index="1" class="java.lang.String" itemvalue="Python tests.Nosetests for test_install.installTestCase.testinstall" /> <item index="1" class="java.lang.String" itemvalue="Python tests.Nosetests in test_install.py" />
<item index="2" class="java.lang.String" itemvalue="Python.tokenTest" /> <item index="2" class="java.lang.String" itemvalue="Python tests.Nosetests for test_install.installTestCase.testinstall" />
<item index="3" class="java.lang.String" itemvalue="Python tests.Nosetests in tokenTest.py" /> <item index="3" class="java.lang.String" itemvalue="Python.tokenTest" />
<item index="4" class="java.lang.String" itemvalue="Python tests.Nosetests in test_batchUpload.py" /> <item index="4" class="java.lang.String" itemvalue="Python tests.Nosetests in tokenTest.py" />
</list> </list>
</recent_temporary> </recent_temporary>
</component> </component>
...@@ -933,12 +928,19 @@ ...@@ -933,12 +928,19 @@
<option name="project" value="LOCAL" /> <option name="project" value="LOCAL" />
<updated>1598324138933</updated> <updated>1598324138933</updated>
</task> </task>
<option name="localTasksCounter" value="38" /> <task id="LOCAL-00038" summary="update">
<created>1598596354765</created>
<option name="number" value="00038" />
<option name="presentableId" value="LOCAL-00038" />
<option name="project" value="LOCAL" />
<updated>1598596354765</updated>
</task>
<option name="localTasksCounter" value="39" />
<servers /> <servers />
</component> </component>
<component name="TestHistory"> <component name="TestHistory">
<history-entry file="Nosetests_for_test_install_installTestCase_testinstall - 2020.08.27 at 17h 05m 35s.xml"> <history-entry file="Nosetests_in_test_adclick_py - 2020.08.28 at 17h 34m 58s.xml">
<configuration name="Nosetests for test_install.installTestCase.testinstall" configurationId="tests" /> <configuration name="Nosetests in test_adclick.py" configurationId="tests" />
</history-entry> </history-entry>
<history-entry file="Nosetests_in_test_install_py - 2020.08.27 at 17h 04m 19s.xml"> <history-entry file="Nosetests_in_test_install_py - 2020.08.27 at 17h 04m 19s.xml">
<configuration name="Nosetests in test_install.py" configurationId="tests" /> <configuration name="Nosetests in test_install.py" configurationId="tests" />
...@@ -985,7 +987,7 @@ ...@@ -985,7 +987,7 @@
<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="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="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="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="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="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" />
...@@ -1024,13 +1026,6 @@ ...@@ -1024,13 +1026,6 @@
<watches-manager /> <watches-manager />
</component> </component>
<component name="editorHistoryManager"> <component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/data/prod.yaml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="225">
<caret line="15" column="31" lean-forward="true" selection-start-line="15" selection-start-column="31" selection-end-line="15" selection-end-column="31" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/testcase/android_click/click.py"> <entry file="file://$PROJECT_DIR$/testcase/android_click/click.py">
<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">
...@@ -1301,7 +1296,7 @@ ...@@ -1301,7 +1296,7 @@
<state relative-caret-position="135"> <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" /> <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#109#124#0" expanded="true" /> <element signature="e#109#124#0" expanded="false" />
</folding> </folding>
</state> </state>
</provider> </provider>
...@@ -1311,7 +1306,7 @@ ...@@ -1311,7 +1306,7 @@
<state relative-caret-position="165"> <state relative-caret-position="165">
<caret line="15" column="45" lean-forward="false" selection-start-line="15" selection-start-column="45" selection-end-line="15" selection-end-column="45" /> <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#107#122#0" expanded="true" /> <element signature="e#107#122#0" expanded="false" />
</folding> </folding>
</state> </state>
</provider> </provider>
...@@ -1334,14 +1329,6 @@ ...@@ -1334,14 +1329,6 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/testcase/android_events/test_adclick.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="240">
<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 />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/testcase/android_events/test_batchUpload.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="105"> <state relative-caret-position="105">
...@@ -1352,49 +1339,65 @@ ...@@ -1352,49 +1339,65 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/config/envcfg.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="300"> <state relative-caret-position="120">
<caret line="23" column="38" lean-forward="false" selection-start-line="23" selection-start-column="38" selection-end-line="23" selection-end-column="38" /> <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 />
</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_startup.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="120"> <state relative-caret-position="120">
<caret line="12" column="0" lean-forward="false" selection-start-line="12" selection-start-column="0" selection-end-line="12" selection-end-column="0" /> <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 />
</state> </state>
</provider> </provider>
</entry> </entry>
<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="150"> <state relative-caret-position="315">
<caret line="10" column="29" lean-forward="false" selection-start-line="10" selection-start-column="29" selection-end-line="10" selection-end-column="29" /> <caret line="21" column="13" lean-forward="false" selection-start-line="21" selection-start-column="12" 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>
<entry file="file://$PROJECT_DIR$/testcase/android_events/test_startup.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="120"> <state relative-caret-position="255">
<caret line="12" column="45" lean-forward="true" selection-start-line="12" selection-start-column="45" selection-end-line="12" selection-end-column="45" /> <caret line="21" column="19" lean-forward="true" selection-start-line="21" selection-start-column="19" selection-end-line="21" selection-end-column="19" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/testcase/android_events/tokenTest.py"> <entry file="file:///anaconda3/lib/python3.6/site-packages/requests/models.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="127">
<caret line="21" column="13" lean-forward="true" selection-start-line="21" selection-start-column="13" selection-end-line="21" selection-end-column="13" /> <caret line="372" column="0" lean-forward="false" selection-start-line="372" selection-start-column="0" selection-end-line="372" selection-end-column="0" />
<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="-18">
<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#100#115#0" expanded="true" /> <element signature="e#97#108#0" expanded="true" />
</folding> </folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/config/envcfg.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="131">
<caret line="25" column="28" lean-forward="false" selection-start-line="25" selection-start-column="28" selection-end-line="25" selection-end-column="28" />
<folding />
</state>
</provider>
</entry>
</component> </component>
</project> </project>
\ No newline at end of file
...@@ -23,6 +23,7 @@ prod = { ...@@ -23,6 +23,7 @@ prod = {
"url": "http://10.3.20.42:8080", "url": "http://10.3.20.42:8080",
"interface": "/receive/tkiov2/install", "interface": "/receive/tkiov2/install",
"appkey": "b58f29d64718c6723895cb8a2389258c", "appkey": "b58f29d64718c6723895cb8a2389258c",
"adclick": "adclick"
}, },
} }
......
...@@ -15,7 +15,7 @@ from config.prod.params import params_adclick ...@@ -15,7 +15,7 @@ from config.prod.params import params_adclick
class adclickTestCase(unittest.TestCase): class adclickTestCase(unittest.TestCase):
def testadclick(self): def testadclick(self):
r = requests.post(url=prod['events']['url'] + 'adclick', data=json.dumps(params_adclick), headers=headers, timeout=5) r = requests.post(url=prod['events']['url'] + prod['events']['adclick'], data=json.dumps(params_adclick), headers=headers, timeout=5)
print("广告点击:" + r.text) print("广告点击:" + r.text)
if __name__ == "__main__": if __name__ == "__main__":
......
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