Commit 13fde0b6 by zhaihuitao

update

parent 46d95e31
......@@ -4,8 +4,9 @@
<list default="true" id="d0064643-2990-4ed3-bfb0-875849b30f4e" name="Default" comment="">
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/config/envcfg.py" afterPath="$PROJECT_DIR$/config/envcfg.py" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/testcase/android_click/click.py" afterPath="$PROJECT_DIR$/testcase/android_click/click.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_click/test_click.py" afterPath="$PROJECT_DIR$/testcase/android_click/test_click.py" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/testcase/android_events/test_install.py" afterPath="$PROJECT_DIR$/testcase/android_events/test_install.py" />
</list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="TRACKING_ENABLED" value="true" />
......@@ -21,7 +22,7 @@
<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/interfaceTest$Nosetests_for_test_click_clickTestCase_click.coverage" NAME="Nosetests for test_click.clickTestCase.click Coverage Results" MODIFIED="1599534820758" 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_install_py.coverage" NAME="Nosetests in test_install.py Coverage Results" MODIFIED="1599892182802" 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/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" />
......@@ -35,7 +36,7 @@
<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$click.coverage" NAME="click Coverage Results" MODIFIED="1599534306408" 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_click_py.coverage" NAME="Nosetests in test_click.py Coverage Results" MODIFIED="1599547427568" 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_click_py.coverage" NAME="Nosetests in test_click.py Coverage Results" MODIFIED="1599891588304" 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="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$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" />
......@@ -65,8 +66,8 @@
<file leaf-file-name="params.py" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/config/prod/params.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="119">
<caret line="13" column="0" lean-forward="false" selection-start-line="13" selection-start-column="0" selection-end-line="13" selection-end-column="0" />
<state relative-caret-position="80">
<caret line="58" column="24" lean-forward="false" selection-start-line="58" selection-start-column="24" selection-end-line="58" selection-end-column="24" />
<folding>
<element signature="e#97#108#0" expanded="true" />
</folding>
......@@ -74,22 +75,10 @@
</provider>
</entry>
</file>
<file leaf-file-name="tokenTest.py" pinned="false" current-in-tab="false">
<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="false" selection-start-line="21" selection-start-column="12" selection-end-line="21" selection-end-column="13" />
<folding>
<element signature="e#100#115#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="baseEvent.py" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/testcase/android_events/baseEvent.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="352">
<state relative-caret-position="3033">
<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>
......@@ -99,8 +88,8 @@
<file leaf-file-name="test_adshow.py" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/testcase/android_events/test_adshow.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" />
<state relative-caret-position="255">
<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>
......@@ -109,8 +98,8 @@
<file leaf-file-name="test_install.py" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/testcase/android_events/test_install.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="180">
<caret line="16" column="37" lean-forward="false" selection-start-line="16" selection-start-column="37" selection-end-line="16" selection-end-column="37" />
<state relative-caret-position="88">
<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 />
</state>
</provider>
......@@ -126,41 +115,51 @@
</provider>
</entry>
</file>
<file leaf-file-name="envcfg.py" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/config/envcfg.py">
<file leaf-file-name="test_batchUpload.py" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/testcase/android_events/test_batchUpload.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-405">
<caret line="6" column="3" lean-forward="true" selection-start-line="6" selection-start-column="3" selection-end-line="6" selection-end-column="3" />
<state relative-caret-position="105">
<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 />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="click.py" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/testcase/android_click/click.py">
<file leaf-file-name="test_custom.py" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/testcase/android_events/test_custom.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="119">
<caret line="13" column="32" lean-forward="false" selection-start-line="13" selection-start-column="32" selection-end-line="13" selection-end-column="32" />
<state relative-caret-position="120">
<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 />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="__init__.py" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/testcase/android_click/__init__.py">
<file leaf-file-name="envcfg.py" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/config/envcfg.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" />
<state relative-caret-position="120">
<caret line="11" column="0" lean-forward="true" selection-start-line="11" selection-start-column="0" selection-end-line="11" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="test_click.py" pinned="false" current-in-tab="false">
<file leaf-file-name="click.py" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/testcase/android_click/click.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-105">
<caret line="13" column="32" lean-forward="false" selection-start-line="13" selection-start-column="32" selection-end-line="13" selection-end-column="32" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="test_click.py" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/testcase/android_click/test_click.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="146">
<caret line="22" column="64" lean-forward="false" selection-start-line="22" selection-start-column="64" selection-end-line="22" selection-end-column="64" />
<state relative-caret-position="-242">
<caret line="20" column="24" lean-forward="true" selection-start-line="20" selection-start-column="24" selection-end-line="20" selection-end-column="24" />
<folding />
</state>
</provider>
......@@ -214,12 +213,12 @@
<option value="$PROJECT_DIR$/testcase/android_events/test_batchUpload.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/test_install.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" />
<option value="$PROJECT_DIR$/testcase/android_click/click.py" />
<option value="$PROJECT_DIR$/testcase/android_click/test_click.py" />
<option value="$PROJECT_DIR$/config/prod/params.py" />
<option value="$PROJECT_DIR$/testcase/android_events/test_install.py" />
<option value="$PROJECT_DIR$/config/envcfg.py" />
</list>
</option>
</component>
......@@ -254,6 +253,8 @@
<foldersAlwaysOnTop value="true" />
</navigator>
<panes>
<pane id="Scope" />
<pane id="Scratches" />
<pane id="ProjectPane">
<subPane>
<PATH>
......@@ -368,8 +369,6 @@
</PATH>
</subPane>
</pane>
<pane id="Scope" />
<pane id="Scratches" />
</panes>
</component>
<component name="ProjectViewState">
......@@ -401,24 +400,7 @@
</list>
</option>
</component>
<component name="RunManager" selected="Python tests.Nosetests for test_click.clickTestCase.testclick">
<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>
<component name="RunManager" selected="Python tests.Nosetests in test_install.py">
<configuration default="false" name="click" type="PythonConfigurationType" factoryName="Python" temporary="true">
<option name="INTERPRETER_OPTIONS" value="" />
<option name="PARENT_ENVS" value="true" />
......@@ -489,6 +471,23 @@
<option name="_new_targetType" value="&quot;PYTHON&quot;" />
<method />
</configuration>
<configuration default="false" name="Nosetests in test_install.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_install.py&quot;" />
<option name="_new_targetType" value="&quot;PATH&quot;" />
<method />
</configuration>
<configuration default="true" type="DjangoTestsConfigurationType" factoryName="Django tests">
<option name="INTERPRETER_OPTIONS" value="" />
<option name="PARENT_ENVS" value="true" />
......@@ -639,19 +638,19 @@
<method />
</configuration>
<list size="5">
<item index="0" class="java.lang.String" itemvalue="Python tests.Nosetests in test_adclick.py" />
<item index="1" class="java.lang.String" itemvalue="Python.click" />
<item index="2" class="java.lang.String" itemvalue="Python tests.Nosetests for test_click.clickTestCase.click" />
<item index="3" class="java.lang.String" itemvalue="Python tests.Nosetests in test_click.py" />
<item index="4" class="java.lang.String" itemvalue="Python tests.Nosetests for test_click.clickTestCase.testclick" />
<item index="0" class="java.lang.String" itemvalue="Python.click" />
<item index="1" class="java.lang.String" itemvalue="Python tests.Nosetests for test_click.clickTestCase.click" />
<item index="2" class="java.lang.String" itemvalue="Python tests.Nosetests in test_click.py" />
<item index="3" class="java.lang.String" itemvalue="Python tests.Nosetests for test_click.clickTestCase.testclick" />
<item index="4" class="java.lang.String" itemvalue="Python tests.Nosetests in test_install.py" />
</list>
<recent_temporary>
<list size="5">
<item index="0" class="java.lang.String" itemvalue="Python tests.Nosetests for test_click.clickTestCase.testclick" />
<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_click.py" />
<item index="2" class="java.lang.String" itemvalue="Python tests.Nosetests for test_click.clickTestCase.click" />
<item index="3" class="java.lang.String" itemvalue="Python.click" />
<item index="4" class="java.lang.String" itemvalue="Python tests.Nosetests in test_adclick.py" />
<item index="2" class="java.lang.String" itemvalue="Python tests.Nosetests for test_click.clickTestCase.testclick" />
<item index="3" class="java.lang.String" itemvalue="Python tests.Nosetests for test_click.clickTestCase.click" />
<item index="4" class="java.lang.String" itemvalue="Python.click" />
</list>
</recent_temporary>
</component>
......@@ -964,22 +963,17 @@
<option name="project" value="LOCAL" />
<updated>1599048133897</updated>
</task>
<option name="localTasksCounter" value="43" />
<task id="LOCAL-00043" summary="update">
<created>1599569000215</created>
<option name="number" value="00043" />
<option name="presentableId" value="LOCAL-00043" />
<option name="project" value="LOCAL" />
<updated>1599569000215</updated>
</task>
<option name="localTasksCounter" value="44" />
<servers />
</component>
<component name="TestHistory">
<history-entry file="Nosetests_for_test_click_clickTestCase_click - 2020.09.08 at 11h 05m 54s.xml">
<configuration name="Nosetests for test_click.clickTestCase.click" configurationId="tests" />
</history-entry>
<history-entry file="Nosetests_for_test_click_clickTestCase_click - 2020.09.08 at 11h 13m 16s.xml">
<configuration name="Nosetests for test_click.clickTestCase.click" configurationId="tests" />
</history-entry>
<history-entry file="Nosetests_for_test_click_clickTestCase_click - 2020.09.08 at 11h 13m 42s.xml">
<configuration name="Nosetests for test_click.clickTestCase.click" configurationId="tests" />
</history-entry>
<history-entry file="Nosetests_for_test_click_clickTestCase_testclick - 2020.09.08 at 14h 44m 27s.xml">
<configuration name="Nosetests for test_click.clickTestCase.testclick" configurationId="tests" />
</history-entry>
<history-entry file="Nosetests_for_test_click_clickTestCase_testclick - 2020.09.08 at 14h 46m 57s.xml">
<configuration name="Nosetests for test_click.clickTestCase.testclick" configurationId="tests" />
</history-entry>
......@@ -989,6 +983,12 @@
<history-entry file="Nosetests_in_test_click_py - 2020.09.08 at 14h 43m 49s.xml">
<configuration name="Nosetests in test_click.py" configurationId="tests" />
</history-entry>
<history-entry file="Nosetests_in_test_click_py - 2020.09.12 at 14h 19m 37s.xml">
<configuration name="Nosetests in test_click.py" configurationId="tests" />
</history-entry>
<history-entry file="Nosetests_in_test_click_py - 2020.09.12 at 14h 19m 49s.xml">
<configuration name="Nosetests in test_click.py" configurationId="tests" />
</history-entry>
<history-entry file="Nosetests_in_test_install_py - 2020.08.27 at 17h 13m 18s.xml">
<configuration name="Nosetests in test_install.py" configurationId="tests" />
</history-entry>
......@@ -998,6 +998,12 @@
<history-entry file="Nosetests_in_test_install_py - 2020.08.27 at 17h 23m 51s.xml">
<configuration name="Nosetests in test_install.py" configurationId="tests" />
</history-entry>
<history-entry file="Nosetests_in_test_install_py - 2020.09.12 at 14h 27m 51s.xml">
<configuration name="Nosetests in test_install.py" configurationId="tests" />
</history-entry>
<history-entry file="Nosetests_in_test_install_py - 2020.09.12 at 14h 29m 44s.xml">
<configuration name="Nosetests in test_install.py" configurationId="tests" />
</history-entry>
</component>
<component name="TodoView">
<todo-panel id="selected-file">
......@@ -1012,7 +1018,7 @@
<frame x="0" y="23" width="1280" height="724" extended-state="0" />
<editor active="true" />
<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="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.21243942" 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="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" />
......@@ -1162,7 +1168,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="247">
<caret line="389" column="4" lean-forward="false" selection-start-line="389" selection-start-column="4" selection-end-line="389" selection-end-column="4" />
<folding />
</state>
</provider>
</entry>
......@@ -1294,9 +1299,6 @@
<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>
<element signature="e#109#124#0" expanded="false" />
</folding>
</state>
</provider>
</entry>
......@@ -1304,19 +1306,6 @@
<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="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/testcase/android_events/test_custom.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="120">
<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>
<element signature="e#102#117#0" expanded="false" />
</folding>
</state>
</provider>
</entry>
......@@ -1324,17 +1313,6 @@
<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>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/testcase/android_events/test_batchUpload.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="105">
<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>
<element signature="e#108#123#0" expanded="false" />
</folding>
</state>
</provider>
</entry>
......@@ -1342,7 +1320,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="120">
<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>
......@@ -1356,7 +1333,7 @@
</entry>
<entry file="file://$PROJECT_DIR$/testcase/android_events/tokenTest.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="315">
<state relative-caret-position="300">
<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>
<element signature="e#100#115#0" expanded="true" />
......@@ -1364,76 +1341,92 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/testcase/android_events/baseEvent.py">
<entry file="file://$PROJECT_DIR$/testcase/android_click/__init__.py">
<provider selected="true" editor-type-id="text-editor">
<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" />
<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>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/testcase/android_click/__init__.py">
<entry file="file://$PROJECT_DIR$/testcase/android_events/test_batchUpload.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" />
<state relative-caret-position="105">
<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 />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/testcase/android_events/test_adclick.py">
<entry file="file://$PROJECT_DIR$/testcase/android_events/test_custom.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="195">
<caret line="17" column="79" lean-forward="false" selection-start-line="17" selection-start-column="79" selection-end-line="17" selection-end-column="79" />
<state relative-caret-position="120">
<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 />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/testcase/android_events/test_install.py">
<entry file="file://$PROJECT_DIR$/testcase/android_events/baseEvent.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="180">
<caret line="16" column="37" lean-forward="false" selection-start-line="16" selection-start-column="37" selection-end-line="16" selection-end-column="37" />
<state relative-caret-position="3033">
<caret line="487" column="13" lean-forward="false" selection-start-line="487" selection-start-column="13" selection-end-line="487" selection-end-column="13" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/testcase/android_click/click.py">
<entry file="file://$PROJECT_DIR$/testcase/android_events/test_adshow.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="119">
<caret line="13" column="32" lean-forward="false" selection-start-line="13" selection-start-column="32" selection-end-line="13" selection-end-column="32" />
<state relative-caret-position="255">
<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>
<entry file="file://$PROJECT_DIR$/testcase/android_events/test_adshow.py">
<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" />
<state relative-caret-position="195">
<caret line="17" column="79" lean-forward="false" selection-start-line="17" selection-start-column="79" selection-end-line="17" selection-end-column="79" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/testcase/android_click/test_click.py">
<entry file="file://$PROJECT_DIR$/testcase/android_click/click.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="146">
<caret line="22" column="64" lean-forward="false" selection-start-line="22" selection-start-column="64" selection-end-line="22" selection-end-column="64" />
<state relative-caret-position="-105">
<caret line="13" column="32" lean-forward="false" selection-start-line="13" selection-start-column="32" selection-end-line="13" selection-end-column="32" />
<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="119">
<caret line="13" column="0" lean-forward="false" selection-start-line="13" selection-start-column="0" selection-end-line="13" selection-end-column="0" />
<state relative-caret-position="80">
<caret line="58" column="24" lean-forward="false" selection-start-line="58" selection-start-column="24" selection-end-line="58" selection-end-column="24" />
<folding>
<element signature="e#97#108#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/testcase/android_events/test_install.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="88">
<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 />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/config/envcfg.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-405">
<caret line="6" column="3" lean-forward="true" selection-start-line="6" selection-start-column="3" selection-end-line="6" selection-end-column="3" />
<state relative-caret-position="120">
<caret line="11" column="0" lean-forward="true" selection-start-line="11" selection-start-column="0" selection-end-line="11" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/testcase/android_click/test_click.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-242">
<caret line="20" column="24" lean-forward="true" selection-start-line="20" selection-start-column="24" selection-end-line="20" selection-end-column="24" />
<folding />
</state>
</provider>
......
# -*- coding: utf-8 -*-
"""
@author:zhaiht
@file: envcfg.py.py
@file: envcfg.py
@time: 2020/8/6 17:34
@desc:
"""
......@@ -13,10 +13,17 @@ import time
# 测试环境
# 生产环境:
prod_click_url = 'http://uri6.com/tkio/Er6BFna'
prod_event_url = 'http://log.trackingio.com'
prod_appkey = "895c5256a7f47bd2cca88a29da9e978a"
event_interface = {"events": ['/receive/tkio/install']}
prod = {
"click": ["http://t.uri6.com/tkio/EFbIzya?noredirect=true", "9b17c1568c3ce34599c5fd2778483ff9"],
"click": ["http://t.uri6.com/tkio/EFbIzya?noredirect=true", "895c5256a7f47bd2cca88a29da9e978a"],
"events": {
"url": "http://tlog.trackingio.com/receive/tkio/",
"url": "http://log.trackingio.com/receive/tkio/",
# "url": "http://10.3.20.42:8080",
"interface": "/receive/tkiov2/install",
"appkey": "b58f29d64718c6723895cb8a2389258c",
......
......@@ -7,7 +7,7 @@
"""
import time
from config.envcfg import prod
from config.envcfg import prod, prod_appkey
from common import randomUtil
......@@ -56,7 +56,7 @@ params_click = {
params_install = {
"what": 'install',
"appid": prod['events']['appkey'],
"appid": prod_appkey,
"context": {
"_carrier": "中国联通",
"_network_type": "5G",
......
......@@ -7,8 +7,7 @@
"""
import unittest
from config.envcfg import prod
from common import randomUtil
from config.envcfg import prod_click_url
from config.prod.params import params_click
import requests
import os
......@@ -20,8 +19,8 @@ sys.path.append(base_path)
class clickTestCase(unittest.TestCase):
def testclick(self):
p = requests.get(url=prod['click'][1], params=params_click, timeout=30, verify=False)
self.assertEqual(p.status_code, 300, msg='接口异常,请检查')
p = requests.get(url=prod_click_url, params=params_click, timeout=30, verify=False)
# self.assertEqual(p.status_code, 300, msg='接口异常,请检查')
print('执行结果:\n=================')
print(p)
# time.sleep(7)
......
......@@ -8,13 +8,13 @@
import requests
import json
import unittest
from config.envcfg import prod, headers
from config.envcfg import prod_event_url, event_interface, headers
from config.prod.params import params_install
class installTestCase(unittest.TestCase):
def testinstall(self):
r = requests.post(url=prod["events"]["url"] + prod['events']['interface'], data=json.dumps(params_install), headers=headers)
r = requests.post(url=prod_event_url+event_interface["events"][0], data=json.dumps(params_install), headers=headers)
print("\n激活事件执行结果:" + r.text)
print(r.url)
#self.assertEqual(r.status_code, 200, msg="执行失败,请检查")
......
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