Commit e1a17d67 by zhaihuitao

update

parent 8416dcaa
......@@ -2,12 +2,10 @@
<project version="4">
<component name="ChangeListManager">
<list default="true" id="d0064643-2990-4ed3-bfb0-875849b30f4e" name="Default" comment="">
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/common/socket/TCPclient.py" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/common/socket/__init__.py" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/common/socket/socketTest.py" />
<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/setting/config.ini" afterPath="$PROJECT_DIR$/config/setting/config.ini" />
<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_login.py" afterPath="$PROJECT_DIR$/testcase/android_events/test_login.py" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/testcase/android_events/test_startup.py" afterPath="$PROJECT_DIR$/testcase/android_events/test_startup.py" />
</list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="TRACKING_ENABLED" value="true" />
......@@ -31,6 +29,7 @@
<SUITE FILE_PATH="coverage/interfaceTest$Nosetests_for_test_startup_startupTestCase_teststartup.coverage" NAME="Nosetests for test_startup.startupTestCase.teststartup Coverage Results" MODIFIED="1601195878274" 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_payorder_payorderTestCase_testpayorder.coverage" NAME="Nosetests for test_payorder.payorderTestCase.testpayorder Coverage Results" MODIFIED="1601200336164" 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_login_loninTestCase_testlogin.coverage" NAME="Nosetests for test_login.loninTestCase.testlogin Coverage Results" MODIFIED="1600325137900" 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$socketTest.coverage" NAME="socketTest Coverage Results" MODIFIED="1601280717776" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/common/socket" />
<SUITE FILE_PATH="coverage/interfaceTest$Nosetests_in_test_login_py.coverage" NAME="Nosetests in test_login.py Coverage Results" MODIFIED="1601195634438" 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" />
......@@ -79,7 +78,7 @@
<entry file="file://$PROJECT_DIR$/testcase/android_events/test_adshow.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="157">
<caret line="12" column="44" lean-forward="true" selection-start-line="12" selection-start-column="44" selection-end-line="12" selection-end-column="44" />
<caret line="12" column="44" lean-forward="false" selection-start-line="12" selection-start-column="44" selection-end-line="12" selection-end-column="44" />
<folding>
<element signature="e#102#117#0" expanded="true" />
</folding>
......@@ -87,16 +86,40 @@
</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="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="150">
<caret line="14" column="41" lean-forward="true" selection-start-line="14" selection-start-column="41" selection-end-line="14" selection-end-column="41" />
<state relative-caret-position="268">
<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 />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="socketTest.py" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/common/socket/socketTest.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="148">
<caret line="44" column="19" lean-forward="false" selection-start-line="44" selection-start-column="19" selection-end-line="44" selection-end-column="37" />
<folding>
<element signature="e#101#117#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="TCPclient.py" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/common/socket/TCPclient.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="173">
<caret line="13" column="26" lean-forward="false" selection-start-line="13" selection-start-column="26" selection-end-line="13" selection-end-column="26" />
<folding>
<element signature="e#100#113#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="test_adclick.py" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/testcase/android_events/test_adclick.py">
<provider selected="true" editor-type-id="text-editor">
......@@ -111,7 +134,7 @@
<entry file="file://$PROJECT_DIR$/testcase/android_events/test_pageduration.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="135">
<caret line="13" column="50" lean-forward="true" selection-start-line="13" selection-start-column="50" selection-end-line="13" selection-end-column="50" />
<caret line="13" column="50" lean-forward="false" selection-start-line="13" selection-start-column="50" selection-end-line="13" selection-end-column="50" />
<folding />
</state>
</provider>
......@@ -131,27 +154,17 @@
<entry file="file://$PROJECT_DIR$/testcase/android_events/test_payorder.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="120">
<caret line="12" column="46" lean-forward="true" selection-start-line="12" selection-start-column="46" selection-end-line="12" selection-end-column="46" />
<caret line="12" column="46" lean-forward="false" selection-start-line="12" selection-start-column="46" selection-end-line="12" selection-end-column="46" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="test_payment.py" pinned="false" current-in-tab="true">
<file leaf-file-name="test_payment.py" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/testcase/android_events/test_payment.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="105">
<caret line="7" column="0" lean-forward="true" 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="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="150">
<caret line="14" column="0" lean-forward="true" selection-start-line="14" selection-start-column="0" selection-end-line="14" selection-end-column="0" />
<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>
......@@ -161,17 +174,7 @@
<entry file="file://$PROJECT_DIR$/testcase/android_events/test_appduration.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="120">
<caret line="12" column="49" lean-forward="true" selection-start-line="12" selection-start-column="49" selection-end-line="12" selection-end-column="49" />
<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="true" selection-start-line="7" selection-start-column="0" selection-end-line="7" selection-end-column="0" />
<caret line="12" column="49" lean-forward="false" selection-start-line="12" selection-start-column="49" selection-end-line="12" selection-end-column="49" />
<folding />
</state>
</provider>
......@@ -245,6 +248,8 @@
<option value="$PROJECT_DIR$/testcase/android_events/test_login.py" />
<option value="$PROJECT_DIR$/testcase/android_events/test_startup.py" />
<option value="$PROJECT_DIR$/config/envcfg.py" />
<option value="$PROJECT_DIR$/common/socket/socketTest.py" />
<option value="$PROJECT_DIR$/common/socket/TCPclient.py" />
</list>
</option>
</component>
......@@ -409,6 +414,24 @@
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
<option name="myItemId" value="interfaceTest" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="interfaceTest" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="common" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="socket" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
</PATH>
</subPane>
</pane>
<pane id="Scope" />
......@@ -421,7 +444,7 @@
</component>
<component name="PropertiesComponent">
<property name="WebServerToolWindowFactoryState" value="false" />
<property name="settings.editor.selected.configurable" value="preferences.lookFeel" />
<property name="settings.editor.selected.configurable" value="configurable.group.appearance" />
<property name="SearchEverywhereHistoryKey" value="set ba&#9;ACTION&#9;Images.SetBackgroundImage&#10;backg&#9;ACTION&#9;Images.SetBackgroundImage&#10;set &#9;ACTION&#9;Images.SetBackgroundImage&#10;set background&#9;null&#9;null" />
<property name="com.intellij.database.dataSource.DataSourceTemplate" value="MySQL" />
</component>
......@@ -444,24 +467,7 @@
</list>
</option>
</component>
<component name="RunManager" selected="Python tests.Nosetests in test_payment.py">
<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.socketTest">
<configuration default="false" name="Nosetests in test_pageduration.py" type="tests" factoryName="Nosetests" temporary="true" nameIsGenerated="true">
<option name="INTERPRETER_OPTIONS" value="" />
<option name="PARENT_ENVS" value="true" />
......@@ -530,6 +536,25 @@
<option name="_new_targetType" value="&quot;PATH&quot;" />
<method />
</configuration>
<configuration default="false" name="socketTest" type="PythonConfigurationType" factoryName="Python" temporary="true">
<option name="INTERPRETER_OPTIONS" value="" />
<option name="PARENT_ENVS" value="true" />
<envs>
<env name="PYTHONUNBUFFERED" value="1" />
</envs>
<option name="SDK_HOME" value="" />
<option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/common/socket" />
<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" sample_coverage="true" runner="coverage.py" />
<option name="SCRIPT_NAME" value="$PROJECT_DIR$/common/socket/socketTest.py" />
<option name="PARAMETERS" value="" />
<option name="SHOW_COMMAND_LINE" value="false" />
<option name="EMULATE_TERMINAL" value="false" />
<method />
</configuration>
<configuration default="true" type="DjangoTestsConfigurationType" factoryName="Django tests">
<option name="INTERPRETER_OPTIONS" value="" />
<option name="PARENT_ENVS" value="true" />
......@@ -680,19 +705,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 tests.Nosetests in test_pageduration.py" />
<item index="2" class="java.lang.String" itemvalue="Python tests.Nosetests in test_payorder.py" />
<item index="3" class="java.lang.String" itemvalue="Python tests.Nosetests for test_payorder.payorderTestCase.testpayorder" />
<item index="4" class="java.lang.String" itemvalue="Python tests.Nosetests in test_payment.py" />
<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_payorder.py" />
<item index="2" class="java.lang.String" itemvalue="Python tests.Nosetests for test_payorder.payorderTestCase.testpayorder" />
<item index="3" class="java.lang.String" itemvalue="Python tests.Nosetests in test_payment.py" />
<item index="4" class="java.lang.String" itemvalue="Python.socketTest" />
</list>
<recent_temporary>
<list size="5">
<item index="0" class="java.lang.String" itemvalue="Python tests.Nosetests in test_payment.py" />
<item index="1" class="java.lang.String" itemvalue="Python tests.Nosetests in test_payorder.py" />
<item index="2" class="java.lang.String" itemvalue="Python tests.Nosetests for test_payorder.payorderTestCase.testpayorder" />
<item index="3" class="java.lang.String" itemvalue="Python tests.Nosetests in test_pageduration.py" />
<item index="4" class="java.lang.String" itemvalue="Python tests.Nosetests in test_adclick.py" />
<item index="0" class="java.lang.String" itemvalue="Python.socketTest" />
<item index="1" class="java.lang.String" itemvalue="Python tests.Nosetests in test_payment.py" />
<item index="2" class="java.lang.String" itemvalue="Python tests.Nosetests in test_payorder.py" />
<item index="3" class="java.lang.String" itemvalue="Python tests.Nosetests for test_payorder.payorderTestCase.testpayorder" />
<item index="4" class="java.lang.String" itemvalue="Python tests.Nosetests in test_pageduration.py" />
</list>
</recent_temporary>
</component>
......@@ -1047,7 +1072,14 @@
<option name="project" value="LOCAL" />
<updated>1601173589272</updated>
</task>
<option name="localTasksCounter" value="49" />
<task id="LOCAL-00049" summary="update">
<created>1601261413693</created>
<option name="number" value="00049" />
<option name="presentableId" value="LOCAL-00049" />
<option name="project" value="LOCAL" />
<updated>1601261413693</updated>
</task>
<option name="localTasksCounter" value="50" />
<servers />
</component>
<component name="TestHistory">
......@@ -1093,11 +1125,10 @@
</component>
<component name="ToolWindowManager">
<frame x="0" y="23" width="1280" height="724" extended-state="0" />
<editor active="true" />
<layout>
<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="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="Run" active="true" 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="Python Console" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32838285" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
<window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32838285" sideWeight="0.4951535" order="9" side_tool="false" content_ui="tabs" />
......@@ -1161,26 +1192,6 @@
<watches-manager />
</component>
<component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/config/envcfg.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="840">
<caret line="59" column="17" lean-forward="true" selection-start-line="59" selection-start-column="17" selection-end-line="59" selection-end-column="17" />
<folding>
<element signature="e#95#117#0" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/config/prod/params.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="690">
<caret line="46" column="1" lean-forward="false" selection-start-line="46" selection-start-column="1" selection-end-line="46" selection-end-column="1" />
<folding>
<element signature="e#97#108#0" expanded="false" />
</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="225">
......@@ -1330,13 +1341,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/testcase/android_events/tokenTest.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="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" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/testcase/android_click/__init__.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
......@@ -1467,7 +1471,7 @@
<entry file="file://$PROJECT_DIR$/testcase/android_events/test_install.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="150">
<caret line="14" column="41" lean-forward="true" selection-start-line="14" selection-start-column="41" selection-end-line="14" selection-end-column="41" />
<caret line="14" column="41" lean-forward="false" selection-start-line="14" selection-start-column="41" selection-end-line="14" selection-end-column="41" />
<folding />
</state>
</provider>
......@@ -1475,7 +1479,7 @@
<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="true" selection-start-line="7" selection-start-column="0" selection-end-line="7" selection-end-column="0" />
<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>
......@@ -1483,7 +1487,7 @@
<entry file="file://$PROJECT_DIR$/testcase/android_events/test_batchUpload.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="150">
<caret line="14" column="0" lean-forward="true" selection-start-line="14" selection-start-column="0" selection-end-line="14" selection-end-column="0" />
<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>
......@@ -1491,7 +1495,7 @@
<entry file="file://$PROJECT_DIR$/testcase/android_events/test_appduration.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="120">
<caret line="12" column="49" lean-forward="true" selection-start-line="12" selection-start-column="49" selection-end-line="12" selection-end-column="49" />
<caret line="12" column="49" lean-forward="false" selection-start-line="12" selection-start-column="49" selection-end-line="12" selection-end-column="49" />
<folding />
</state>
</provider>
......@@ -1499,7 +1503,7 @@
<entry file="file://$PROJECT_DIR$/testcase/android_events/test_adshow.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="157">
<caret line="12" column="44" lean-forward="true" selection-start-line="12" selection-start-column="44" selection-end-line="12" selection-end-column="44" />
<caret line="12" column="44" lean-forward="false" selection-start-line="12" selection-start-column="44" selection-end-line="12" selection-end-column="44" />
<folding>
<element signature="e#102#117#0" expanded="true" />
</folding>
......@@ -1517,7 +1521,7 @@
<entry file="file://$PROJECT_DIR$/testcase/android_events/test_pageduration.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="135">
<caret line="13" column="50" lean-forward="true" selection-start-line="13" selection-start-column="50" selection-end-line="13" selection-end-column="50" />
<caret line="13" column="50" lean-forward="false" selection-start-line="13" selection-start-column="50" selection-end-line="13" selection-end-column="50" />
<folding />
</state>
</provider>
......@@ -1533,7 +1537,7 @@
<entry file="file://$PROJECT_DIR$/testcase/android_events/test_payorder.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="120">
<caret line="12" column="46" lean-forward="true" selection-start-line="12" selection-start-column="46" selection-end-line="12" selection-end-column="46" />
<caret line="12" column="46" lean-forward="false" selection-start-line="12" selection-start-column="46" selection-end-line="12" selection-end-column="46" />
<folding />
</state>
</provider>
......@@ -1541,10 +1545,38 @@
<entry file="file://$PROJECT_DIR$/testcase/android_events/test_payment.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="105">
<caret line="7" column="0" lean-forward="true" selection-start-line="7" selection-start-column="0" selection-end-line="7" selection-end-column="0" />
<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/tokenTest.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="268">
<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 />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/common/socket/socketTest.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="148">
<caret line="44" column="19" lean-forward="false" selection-start-line="44" selection-start-column="19" selection-end-line="44" selection-end-column="37" />
<folding>
<element signature="e#101#117#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/common/socket/TCPclient.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="173">
<caret line="13" column="26" lean-forward="false" selection-start-line="13" selection-start-column="26" selection-end-line="13" selection-end-column="26" />
<folding>
<element signature="e#100#113#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</component>
</project>
\ No newline at end of file
# -*- coding: utf-8 -*-
"""
@author:zhaiht
@file: TCPclient.py
@time: 2020/9/28 17:55
@desc:
"""
import socket
import logging
class TCPClient(object):
"""用于测试socket请求"""
def __init__(self, domain, port, timeout=30, max_receive=102400):
self.domain = domain
self.port = port
self.connected = 0 # 连接后置为1
self.max_receive = max_receive
self._sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
self._sock.settimeout(timeout)
def connect(self):
"""连接指定IP、端口"""
if not self.connected:
try:
self._sock.connect((self.domain, self.port))
except socket.error as e:
logging.exception(e)
else:
self.connected = 1
logger.debug('TCPClient connect to {0}:{1} success.'.format(self.domain, self.port))
def send(self, data, dtype='str', suffix=''):
"""向服务器端发送send_string,并返回信息,若报错,则返回None"""
if dtype == 'json':
send_string = json.dumps(data) + suffix
else:
send_string = data + suffix
self.connect()
if self.connected:
try:
self._sock.send(send_string.encode())
logger.debug('TCPClient Send {0}'.format(send_string))
except socket.error as e:
logger.exception(e)
try:
rec = self._sock.recv(self.max_receive).decode()
if suffix:
rec = rec[:-len(suffix)]
logger.debug('TCPClient received {0}'.format(rec))
return rec
except socket.error as e:
logger.exception(e)
def close(self):
"""关闭连接"""
if self.connected:
self._sock.close()
logger.debug('TCPClient closed.')
\ No newline at end of file
# -*- coding: utf-8 -*-
"""
@author:zhaiht
@file: __init__.py.py
@time: 2020/9/28 11:22
@desc:
"""
\ No newline at end of file
# -*- coding: utf-8 -*-
"""
@author:zhaiht
@file: socketTest.py
@time: 2020/9/28 11:22
@desc:
"""
import websocket
from threading import Thread
import time
import sys
def on_message(ws, message):
print(message)
def on_error(ws, error):
print(error)
def on_close(ws):
print("### closed ###")
def on_open(ws):
def run(*args):
for i in range(3):
# send the message, then wait
# so thread doesn't exit and socket
# isn't closed
ws.send("1 %d" % i)
time.sleep(1)
time.sleep(1)
ws.close()
print("Thread terminating...")
Thread(target=run).start()
if __name__ == "__main__":
websocket.enableTrace(True)
# host = "ws://echo.websocket.org/"
host = "ws://game-receiver-lwq-24943018.cn-north-1.elb.amazonaws.com.cn:6783"
ws = websocket.WebSocketApp(host,
on_message=on_message,
on_error=on_error,
on_close=on_close)
ws.on_open = on_open
ws.run_forever()
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