diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 1d3c040..145ed32 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -3,9 +3,8 @@ <component name="ChangeListManager"> <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$/testcase/android_events/test_install.py" afterPath="$PROJECT_DIR$/testcase/android_events/test_install.py" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/testcase/android_events/test_payment.py" afterPath="$PROJECT_DIR$/testcase/android_events/test_payment.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$/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" /> </list> <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> <option name="TRACKING_ENABLED" value="true" /> @@ -16,7 +15,7 @@ </component> <component name="CoverageDataManager"> <SUITE FILE_PATH="coverage/interfaceTest$run_all_cases.coverage" NAME="run_all_cases Coverage Results" MODIFIED="1603090835411" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/testcase" /> - <SUITE FILE_PATH="coverage/interfaceTest$Nosetests_for_test_click_clickTestCase_testclick.coverage" NAME="Nosetests for test_click.clickTestCase.testclick Coverage Results" MODIFIED="1599547616053" 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_for_test_click_clickTestCase_testclick.coverage" NAME="Nosetests for test_click.clickTestCase.testclick Coverage Results" MODIFIED="1603353013821" 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$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_batchUpload_py.coverage" NAME="Nosetests in test_batchUpload.py Coverage Results" MODIFIED="1601196142097" 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_payment_payTestCase.coverage" NAME="Nosetests for test_payment.payTestCase Coverage Results" MODIFIED="1602832243651" 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" /> @@ -59,7 +58,7 @@ <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_adshow_py.coverage" NAME="Nosetests in test_adshow.py Coverage Results" MODIFIED="1602832288308" 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_adclick_adclickTestCase.coverage" NAME="Nosetests for test_adclick.adclickTestCase Coverage Results" MODIFIED="1601193673545" 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_click_py.coverage" NAME="Nosetests in test_click.py Coverage Results" MODIFIED="1601195512778" 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="1603352734802" 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_install.coverage" NAME="Nosetests for test_install.installTestCase.install Coverage Results" MODIFIED="1597134802392" 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_pageduration_py.coverage" NAME="Nosetests in test_pageduration.py Coverage Results" MODIFIED="1602832252539" 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_install_py.coverage" NAME="Nosetests in test_install.py Coverage Results" MODIFIED="1597283375565" 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" /> @@ -77,21 +76,11 @@ <component name="ExecutionTargetManager" SELECTED_TARGET="default_target" /> <component name="FileEditorManager"> <leaf SIDE_TABS_SIZE_LIMIT_KEY="300"> - <file leaf-file-name="test_batchUpload.py" pinned="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/testcase/android_events/test_batchUpload.py"> + <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="150"> - <caret line="14" column="0" lean-forward="false" selection-start-line="14" selection-start-column="0" selection-end-line="14" selection-end-column="0" /> - <folding /> - </state> - </provider> - </entry> - </file> - <file leaf-file-name="test_custom.py" pinned="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/testcase/android_events/test_custom.py"> - <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="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" /> + <state relative-caret-position="600"> + <caret line="42" column="18" lean-forward="false" selection-start-line="42" selection-start-column="18" selection-end-line="42" selection-end-column="18" /> <folding /> </state> </provider> @@ -107,21 +96,11 @@ </provider> </entry> </file> - <file leaf-file-name="test_install.py" pinned="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/testcase/android_events/test_install.py"> + <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="210"> - <caret line="18" column="14" lean-forward="false" selection-start-line="18" selection-start-column="14" selection-end-line="18" selection-end-column="14" /> - <folding /> - </state> - </provider> - </entry> - </file> - <file leaf-file-name="test_login.py" pinned="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/testcase/android_events/test_login.py"> - <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="75"> - <caret line="5" column="6" lean-forward="true" selection-start-line="5" selection-start-column="6" selection-end-line="5" selection-end-column="6" /> + <state relative-caret-position="170"> + <caret line="25" column="27" lean-forward="true" selection-start-line="25" selection-start-column="27" selection-end-line="25" selection-end-column="27" /> <folding /> </state> </provider> @@ -147,7 +126,29 @@ </provider> </entry> </file> - <file leaf-file-name="test_register.py" pinned="false" current-in-tab="true"> + <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="130"> + <caret line="24" column="0" lean-forward="false" selection-start-line="24" selection-start-column="0" selection-end-line="24" selection-end-column="0" /> + <folding /> + </state> + </provider> + </entry> + </file> + <file leaf-file-name="run_all_cases.py" pinned="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/testcase/run_all_cases.py"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="180"> + <caret line="12" column="26" lean-forward="true" selection-start-line="12" selection-start-column="26" selection-end-line="12" selection-end-column="26" /> + <folding> + <element signature="e#105#120#0" expanded="true" /> + </folding> + </state> + </provider> + </entry> + </file> + <file leaf-file-name="test_register.py" pinned="false" current-in-tab="false"> <entry file="file://$PROJECT_DIR$/testcase/android_events/test_register.py"> <provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="103"> @@ -244,12 +245,12 @@ <option value="$PROJECT_DIR$/testcase/android_events/test_login.py" /> <option value="$PROJECT_DIR$/common/socket/socketTest.py" /> <option value="$PROJECT_DIR$/common/socket/TCPclient.py" /> - <option value="$PROJECT_DIR$/config/envcfg.py" /> - <option value="$PROJECT_DIR$/config/prod/params.py" /> <option value="$PROJECT_DIR$/testcase/run_all_cases.py" /> <option value="$PROJECT_DIR$/testcase/android_events/test_install.py" /> <option value="$PROJECT_DIR$/testcase/android_events/test_payment.py" /> <option value="$PROJECT_DIR$/testcase/android_events/test_startup.py" /> + <option value="$PROJECT_DIR$/config/envcfg.py" /> + <option value="$PROJECT_DIR$/config/prod/params.py" /> </list> </option> </component> @@ -467,8 +468,8 @@ </list> </option> </component> - <component name="RunManager" selected="Python.run_all_cases"> - <configuration default="false" name="Nosetests in test_pageduration.py" type="tests" factoryName="Nosetests" temporary="true" nameIsGenerated="true"> + <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 /> @@ -481,11 +482,11 @@ <EXTENSION ID="PythonCoverageRunConfigurationExtension" enabled="false" runner="coverage.py" /> <option name="_new_regexPattern" value="""" /> <option name="_new_additionalArguments" value="""" /> - <option name="_new_target" value=""$PROJECT_DIR$/testcase/android_events/test_pageduration.py"" /> + <option name="_new_target" value=""$PROJECT_DIR$/testcase/android_events/test_adclick.py"" /> <option name="_new_targetType" value=""PATH"" /> <method /> </configuration> - <configuration default="false" name="Nosetests in test_appduration.py" type="tests" factoryName="Nosetests" temporary="true" nameIsGenerated="true"> + <configuration default="false" name="Nosetests in test_adshow.py" type="tests" factoryName="Nosetests" temporary="true" nameIsGenerated="true"> <option name="INTERPRETER_OPTIONS" value="" /> <option name="PARENT_ENVS" value="true" /> <envs /> @@ -498,33 +499,35 @@ <EXTENSION ID="PythonCoverageRunConfigurationExtension" enabled="false" runner="coverage.py" /> <option name="_new_regexPattern" value="""" /> <option name="_new_additionalArguments" value="""" /> - <option name="_new_target" value=""$PROJECT_DIR$/testcase/android_events/test_appduration.py"" /> + <option name="_new_target" value=""$PROJECT_DIR$/testcase/android_events/test_adshow.py"" /> <option name="_new_targetType" value=""PATH"" /> <method /> </configuration> - <configuration default="false" name="Nosetests in test_adclick.py" type="tests" factoryName="Nosetests" temporary="true" nameIsGenerated="true"> + <configuration default="false" name="run_all_cases" type="PythonConfigurationType" factoryName="Python" temporary="true"> <option name="INTERPRETER_OPTIONS" value="" /> <option name="PARENT_ENVS" value="true" /> - <envs /> + <envs> + <env name="PYTHONUNBUFFERED" value="1" /> + </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="WORKING_DIRECTORY" value="$PROJECT_DIR$/testcase" /> + <option name="IS_MODULE_SDK" value="true" /> <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="""" /> - <option name="_new_additionalArguments" value="""" /> - <option name="_new_target" value=""$PROJECT_DIR$/testcase/android_events/test_adclick.py"" /> - <option name="_new_targetType" value=""PATH"" /> + <EXTENSION ID="PythonCoverageRunConfigurationExtension" enabled="false" sample_coverage="true" runner="coverage.py" /> + <option name="SCRIPT_NAME" value="$PROJECT_DIR$/testcase/run_all_cases.py" /> + <option name="PARAMETERS" value="" /> + <option name="SHOW_COMMAND_LINE" value="false" /> + <option name="EMULATE_TERMINAL" value="false" /> <method /> </configuration> - <configuration default="false" name="Nosetests in test_adshow.py" type="tests" factoryName="Nosetests" temporary="true" nameIsGenerated="true"> + <configuration default="false" name="Nosetests in test_click.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="WORKING_DIRECTORY" value="$PROJECT_DIR$/testcase/android_click" /> <option name="IS_MODULE_SDK" value="false" /> <option name="ADD_CONTENT_ROOTS" value="true" /> <option name="ADD_SOURCE_ROOTS" value="true" /> @@ -532,27 +535,25 @@ <EXTENSION ID="PythonCoverageRunConfigurationExtension" enabled="false" runner="coverage.py" /> <option name="_new_regexPattern" value="""" /> <option name="_new_additionalArguments" value="""" /> - <option name="_new_target" value=""$PROJECT_DIR$/testcase/android_events/test_adshow.py"" /> + <option name="_new_target" value=""$PROJECT_DIR$/testcase/android_click/test_click.py"" /> <option name="_new_targetType" value=""PATH"" /> <method /> </configuration> - <configuration default="false" name="run_all_cases" type="PythonConfigurationType" factoryName="Python" temporary="true"> + <configuration default="false" name="Nosetests for test_click.clickTestCase.testclick" type="tests" factoryName="Nosetests" temporary="true" nameIsGenerated="true"> <option name="INTERPRETER_OPTIONS" value="" /> <option name="PARENT_ENVS" value="true" /> - <envs> - <env name="PYTHONUNBUFFERED" value="1" /> - </envs> + <envs /> <option name="SDK_HOME" value="" /> - <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/testcase" /> - <option name="IS_MODULE_SDK" value="true" /> + <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/testcase/android_click" /> + <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" sample_coverage="true" runner="coverage.py" /> - <option name="SCRIPT_NAME" value="$PROJECT_DIR$/testcase/run_all_cases.py" /> - <option name="PARAMETERS" value="" /> - <option name="SHOW_COMMAND_LINE" value="false" /> - <option name="EMULATE_TERMINAL" value="false" /> + <EXTENSION ID="PythonCoverageRunConfigurationExtension" enabled="false" runner="coverage.py" /> + <option name="_new_regexPattern" value="""" /> + <option name="_new_additionalArguments" value="""" /> + <option name="_new_target" value=""test_click.clickTestCase.testclick"" /> + <option name="_new_targetType" value=""PYTHON"" /> <method /> </configuration> <configuration default="true" type="DjangoTestsConfigurationType" factoryName="Django tests"> @@ -705,19 +706,19 @@ <method /> </configuration> <list size="5"> - <item index="0" class="java.lang.String" itemvalue="Python tests.Nosetests in test_pageduration.py" /> - <item index="1" class="java.lang.String" itemvalue="Python tests.Nosetests in test_appduration.py" /> - <item index="2" class="java.lang.String" itemvalue="Python tests.Nosetests in test_adclick.py" /> - <item index="3" class="java.lang.String" itemvalue="Python tests.Nosetests in test_adshow.py" /> - <item index="4" class="java.lang.String" itemvalue="Python.run_all_cases" /> + <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 in test_adshow.py" /> + <item index="2" class="java.lang.String" itemvalue="Python.run_all_cases" /> + <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" /> </list> <recent_temporary> <list size="5"> - <item index="0" class="java.lang.String" itemvalue="Python.run_all_cases" /> - <item index="1" class="java.lang.String" itemvalue="Python tests.Nosetests in test_adshow.py" /> - <item index="2" class="java.lang.String" itemvalue="Python tests.Nosetests in test_adclick.py" /> - <item index="3" class="java.lang.String" itemvalue="Python tests.Nosetests in test_appduration.py" /> - <item index="4" class="java.lang.String" itemvalue="Python tests.Nosetests in test_pageduration.py" /> + <item index="0" class="java.lang.String" itemvalue="Python tests.Nosetests for test_click.clickTestCase.testclick" /> + <item index="1" class="java.lang.String" itemvalue="Python tests.Nosetests in test_click.py" /> + <item index="2" class="java.lang.String" itemvalue="Python.run_all_cases" /> + <item index="3" 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_adclick.py" /> </list> </recent_temporary> </component> @@ -736,13 +737,6 @@ <updated>1596505503233</updated> <workItem from="1596786333197" duration="228000" /> </task> - <task id="LOCAL-00004" summary="添加生产环境配置信息"> - <created>1596681587413</created> - <option name="number" value="00004" /> - <option name="presentableId" value="LOCAL-00004" /> - <option name="project" value="LOCAL" /> - <updated>1596681587413</updated> - </task> <task id="LOCAL-00005" summary="添加配置地址"> <created>1596784280784</created> <option name="number" value="00005" /> @@ -1079,10 +1073,20 @@ <option name="project" value="LOCAL" /> <updated>1602919346250</updated> </task> - <option name="localTasksCounter" value="53" /> + <task id="LOCAL-00053" summary="update"> + <created>1603183578574</created> + <option name="number" value="00053" /> + <option name="presentableId" value="LOCAL-00053" /> + <option name="project" value="LOCAL" /> + <updated>1603183578574</updated> + </task> + <option name="localTasksCounter" value="54" /> <servers /> </component> <component name="TestHistory"> + <history-entry file="Nosetests_for_test_click_clickTestCase_testclick - 2020.10.22 at 15h 50m 15s.xml"> + <configuration name="Nosetests for test_click.clickTestCase.testclick" configurationId="tests" /> + </history-entry> <history-entry file="Nosetests_for_test_payment_payTestCase - 2020.10.16 at 15h 10m 45s.xml"> <configuration name="Nosetests for test_payment.payTestCase" configurationId="tests" /> </history-entry> @@ -1098,11 +1102,11 @@ <history-entry file="Nosetests_in_test_appduration_py - 2020.10.16 at 15h 11m 08s.xml"> <configuration name="Nosetests in test_appduration.py" configurationId="tests" /> </history-entry> - <history-entry file="Nosetests_in_test_install_py - 2020.10.16 at 15h 08m 39s.xml"> - <configuration name="Nosetests in test_install.py" configurationId="tests" /> + <history-entry file="Nosetests_in_test_click_py - 2020.10.22 at 15h 41m 20s.xml"> + <configuration name="Nosetests in test_click.py" configurationId="tests" /> </history-entry> - <history-entry file="Nosetests_in_test_login_py - 2020.10.16 at 15h 09m 49s.xml"> - <configuration name="Nosetests in test_login.py" configurationId="tests" /> + <history-entry file="Nosetests_in_test_click_py - 2020.10.22 at 15h 45m 36s.xml"> + <configuration name="Nosetests in test_click.py" configurationId="tests" /> </history-entry> <history-entry file="Nosetests_in_test_pageduration_py - 2020.10.16 at 15h 10m 54s.xml"> <configuration name="Nosetests in test_pageduration.py" configurationId="tests" /> @@ -1110,9 +1114,6 @@ <history-entry file="Nosetests_in_test_register_py - 2020.10.16 at 15h 10m 23s.xml"> <configuration name="Nosetests in test_register.py" configurationId="tests" /> </history-entry> - <history-entry file="Nosetests_in_test_startup_py - 2020.10.16 at 15h 10m 03s.xml"> - <configuration name="Nosetests in test_startup.py" configurationId="tests" /> - </history-entry> </component> <component name="TodoView"> <todo-panel id="selected-file"> @@ -1124,7 +1125,7 @@ </todo-panel> </component> <component name="ToolWindowManager"> - <frame x="0" y="23" width="1280" height="724" extended-state="6" /> + <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.22213247" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" /> @@ -1416,40 +1417,6 @@ </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="240"> - <caret line="21" column="55" lean-forward="false" selection-start-line="21" selection-start-column="55" selection-end-line="21" selection-end-column="55" /> - <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="120"> - <caret line="148" column="35" lean-forward="false" selection-start-line="148" selection-start-column="35" selection-end-line="148" selection-end-column="35" /> - <folding /> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/config/envcfg.py"> - <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="-692"> - <caret line="29" column="50" lean-forward="true" selection-start-line="29" selection-start-column="50" selection-end-line="29" selection-end-column="50" /> - <folding /> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/testcase/run_all_cases.py"> - <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="180"> - <caret line="12" column="26" lean-forward="true" selection-start-line="12" selection-start-column="26" selection-end-line="12" selection-end-column="26" /> - <folding> - <element signature="e#105#120#0" expanded="true" /> - </folding> - </state> - </provider> - </entry> <entry file="file://$PROJECT_DIR$/testcase/android_events/baseEvent.py"> <provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="294"> @@ -1564,5 +1531,39 @@ </state> </provider> </entry> + <entry file="file://$PROJECT_DIR$/testcase/run_all_cases.py"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="180"> + <caret line="12" column="26" lean-forward="true" selection-start-line="12" selection-start-column="26" selection-end-line="12" selection-end-column="26" /> + <folding> + <element signature="e#105#120#0" expanded="true" /> + </folding> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/config/envcfg.py"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="130"> + <caret line="24" column="0" lean-forward="false" selection-start-line="24" selection-start-column="0" selection-end-line="24" 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="600"> + <caret line="42" column="18" lean-forward="false" selection-start-line="42" selection-start-column="18" selection-end-line="42" selection-end-column="18" /> + <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="170"> + <caret line="25" column="27" lean-forward="true" selection-start-line="25" selection-start-column="27" selection-end-line="25" selection-end-column="27" /> + <folding /> + </state> + </provider> + </entry> </component> </project> \ No newline at end of file diff --git a/config/envcfg.py b/config/envcfg.py index 76b628e..7d2b2e3 100644 --- a/config/envcfg.py +++ b/config/envcfg.py @@ -23,10 +23,10 @@ print(base_path) click_url = 'http://uri6.com/tkio/Er6BFna' -# prod_event_url = 'http://log.trackingio.com' -prod_event_url = 'http://10.3.20.42:8080' +prod_event_url = 'http://log.trackingio.com' +# prod_event_url = 'http://10.3.20.42:8080' test_event_url = 'http://10.3.20.42:8080' -prod_appkey = "0d401839250deff23daf62fd49a444cb" +prod_appkey = "895c5256a7f47bd2cca88a29da9e978a" # prod_appkey = "57ed2dd31596bb4682471e82c0c73c1a" event_interface = dict(install='/receive/tkio/install', loggedin='/receive/tkio/loggedin', pageduration='/receive/tkio/pageduration', payment='/receive/tkio/payment', diff --git a/config/prod/params.py b/config/prod/params.py index daf8a66..38a9277 100644 --- a/config/prod/params.py +++ b/config/prod/params.py @@ -12,9 +12,9 @@ from common import randomUtil params_click = { - 'androidid': "43214532142142", - 'imei': "881554685049", - # "idfa": 'DBC43622-E38B-440C-B7A7-FB6641D0D9AB', + # 'androidid': "43214532142142", + # 'imei': "881554685049", + "idfa": 'DBC43622-E38B-440C-B7A7-FB6641D0D9AB', 'ip': randomUtil.r.randip(), #"idfa": "00000000-0000-0000-0000-000000000000", # "idfv": "" @@ -40,7 +40,7 @@ params_click = { # 'csite': '333', # "timestamp": "1569141628027", # "creative": "31096865315", - "deviceid": "881554685049", + # "deviceid": "881554685049", # "tz": "+8", # "wx_campaign_id":ry_adgroup_id, # 'wx_adgroup_id':ry_adplan_id,