Commit cbfa6aba authored by 刘丙寅's avatar 刘丙寅

666

parent 35f26421
......@@ -2,20 +2,13 @@
<project version="4">
<component name="ChangeListManager">
<list default="true" id="7e9981c3-87b3-4c10-977f-3fdfc3f8d2ec" name="Default Changelist" comment="">
<change afterPath="$PROJECT_DIR$/case/case_hera_celue_test.py" afterDir="false" />
<change afterPath="$PROJECT_DIR$/case/case_hera_customer_pool.py" afterDir="false" />
<change afterPath="$PROJECT_DIR$/case/case_hera_modify.py" afterDir="false" />
<change afterPath="$PROJECT_DIR$/case/case_om_distribution_list.py" afterDir="false" />
<change afterPath="$PROJECT_DIR$/test_yaml/__init__.py" afterDir="false" />
<change afterPath="$PROJECT_DIR$/test_yaml/customer_pool.yaml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/test_yaml/modify.yaml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/test_yaml/om_distribution.yaml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/test_yaml/zhuanzhen_celue.yaml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/allcase.py" beforeDir="false" afterPath="$PROJECT_DIR$/allcase.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/case/case_zhuanzhen_celue_test.py" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/interface/interface.py" beforeDir="false" afterPath="$PROJECT_DIR$/interface/interface.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/report/转诊.html" beforeDir="false" afterPath="$PROJECT_DIR$/report/转诊.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/case/case_hera_celue_test.py" beforeDir="false" afterPath="$PROJECT_DIR$/case/case_hera_celue_test.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/case/case_hera_customer_pool.py" beforeDir="false" afterPath="$PROJECT_DIR$/case/case_hera_customer_pool.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/case/case_om_distribution_list.py" beforeDir="false" afterPath="$PROJECT_DIR$/case/case_om_distribution_list.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/test_yaml/customer_pool.yaml" beforeDir="false" afterPath="$PROJECT_DIR$/test_yaml/customer_pool.yaml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/test_yaml/om_distribution.yaml" beforeDir="false" afterPath="$PROJECT_DIR$/test_yaml/om_distribution.yaml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/venv/pip-selfcheck.json" beforeDir="false" afterPath="$PROJECT_DIR$/venv/pip-selfcheck.json" afterDir="false" />
</list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
......@@ -25,9 +18,10 @@
<option name="LAST_RESOLUTION" value="IGNORE" />
</component>
<component name="CoverageDataManager">
<SUITE FILE_PATH="coverage/gm_zhuanzhen_test$Unittests_in_case_om_distribution_list_py.coverage" NAME="Unittests in case_om_distribution_list.py Coverage Results" MODIFIED="1628498502040" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/case" />
<SUITE FILE_PATH="coverage/gm_zhuanzhen_test$Unittests_in_case_om_distribution_list_py.coverage" NAME="Unittests in case_om_distribution_list.py Coverage Results" MODIFIED="1628593991298" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/case" />
<SUITE FILE_PATH="coverage/gm_zhuanzhen_test$demo.coverage" NAME="demo Coverage Results" MODIFIED="1622632382026" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/interface" />
<SUITE FILE_PATH="coverage/gm_zhuanzhen_test$Unittests_for_case_customer_pool_Case_test_01_customer_pool.coverage" NAME="Unittests for case_customer_pool.Case.test_01_customer_pool Coverage Results" MODIFIED="1623035642472" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/case" />
<SUITE FILE_PATH="coverage/gm_zhuanzhen_test$Unittests_in_case_hera_customer_pool_py.coverage" NAME="Unittests in case_hera_customer_pool.py Coverage Results" MODIFIED="1628677007205" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/case" />
<SUITE FILE_PATH="coverage/gm_zhuanzhen_test$demo__1_.coverage" NAME="demo (1) Coverage Results" MODIFIED="1622687991600" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/case" />
<SUITE FILE_PATH="coverage/gm_zhuanzhen_test$Unittests_in_case_customer_pool_py.coverage" NAME="Unittests in case_customer_pool.py Coverage Results" MODIFIED="1623150080298" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/case" />
<SUITE FILE_PATH="coverage/gm_zhuanzhen_test$Unittests_for_case_om_distribution_list_case.coverage" NAME="Unittests for case_om_distribution_list.case Coverage Results" MODIFIED="1628490066768" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/case" />
......@@ -46,8 +40,8 @@
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/case/case_hera_celue_test.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="158">
<caret line="16" column="50" selection-start-line="16" selection-start-column="50" selection-end-line="16" selection-end-column="50" />
<state relative-caret-position="148">
<caret line="50" column="54" lean-forward="true" selection-start-line="50" selection-start-column="54" selection-end-line="50" selection-end-column="54" />
<folding>
<element signature="e#0#15#0" expanded="true" />
</folding>
......@@ -56,10 +50,22 @@
</entry>
</file>
<file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/case/case_om_distribution_list.py">
<entry file="file://$PROJECT_DIR$/allcase.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="574">
<caret line="167" column="33" lean-forward="true" selection-start-line="167" selection-start-column="33" selection-end-line="167" selection-end-column="33" />
<folding>
<element signature="e#15#30#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/case/case_hera_customer_pool.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="483">
<caret line="21" column="24" lean-forward="true" selection-start-line="21" selection-start-column="24" selection-end-line="21" selection-end-column="24" />
<state relative-caret-position="119">
<caret line="24" column="1" lean-forward="true" selection-start-line="24" selection-start-column="1" selection-end-line="24" selection-end-column="1" />
<folding>
<element signature="e#0#15#0" expanded="true" />
</folding>
......@@ -68,10 +74,31 @@
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/test_yaml/zhuanzhen_celue.yaml">
<entry file="file://$PROJECT_DIR$/test_yaml/modify.yaml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="529">
<caret line="23" lean-forward="true" selection-start-line="23" selection-end-line="23" />
<state relative-caret-position="368">
<caret line="16" column="15" lean-forward="true" selection-start-line="16" selection-start-column="15" selection-end-line="16" selection-end-column="15" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/test_yaml/customer_pool.yaml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="249">
<caret line="744" column="47" lean-forward="true" selection-start-line="744" selection-start-column="47" selection-end-line="744" selection-end-column="47" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/case/case_om_distribution_list.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="156">
<caret line="24" column="13" lean-forward="true" selection-start-line="24" selection-start-column="13" selection-end-line="24" selection-end-column="13" />
<folding>
<element signature="e#0#15#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
......@@ -79,8 +106,17 @@
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/test_yaml/om_distribution.yaml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="253">
<caret line="11" lean-forward="true" selection-start-line="11" selection-end-line="11" />
<state relative-caret-position="334">
<caret line="189" column="13" lean-forward="true" selection-start-line="189" selection-start-column="13" selection-end-line="189" selection-end-column="13" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/test_yaml/zhuanzhen_celue.yaml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="322">
<caret line="14" column="11" lean-forward="true" selection-start-line="14" selection-start-column="11" selection-end-line="14" selection-end-column="11" />
</state>
</provider>
</entry>
......@@ -118,28 +154,28 @@
<option value="$PROJECT_DIR$/report/__init__.py" />
<option value="$PROJECT_DIR$/case/case_zhuanzhen_celue.py" />
<option value="$PROJECT_DIR$/interface/demo.py" />
<option value="$PROJECT_DIR$/allcase.py" />
<option value="$PROJECT_DIR$/case/demo.py" />
<option value="$PROJECT_DIR$/case/case_zhuanzhen_celue_test.py" />
<option value="$PROJECT_DIR$/case/case_customer_pool.py" />
<option value="$PROJECT_DIR$/test_yaml/customer_pool.yaml" />
<option value="$PROJECT_DIR$/test_yaml/zhuanzhen_celue.yaml" />
<option value="$PROJECT_DIR$/test_yaml/modify.yaml" />
<option value="$PROJECT_DIR$/case/case_modify.py" />
<option value="$PROJECT_DIR$/case/case_hera_celue_test.py" />
<option value="$PROJECT_DIR$/case/case_hera_customer_pool.py" />
<option value="$PROJECT_DIR$/case/case_hera_modify.py" />
<option value="$PROJECT_DIR$/interface/interface.py" />
<option value="$PROJECT_DIR$/case/case_om_distribution_list.py" />
<option value="$PROJECT_DIR$/case/case_hera_celue_test.py" />
<option value="$PROJECT_DIR$/test_yaml/om_distribution.yaml" />
<option value="$PROJECT_DIR$/case/case_hera_customer_pool.py" />
<option value="$PROJECT_DIR$/test_yaml/customer_pool.yaml" />
<option value="$PROJECT_DIR$/allcase.py" />
</list>
</option>
</component>
<component name="ProjectFrameBounds" extendedState="6">
<option name="x" value="-1920" />
<option name="y" value="-180" />
<option name="y" value="-157" />
<option name="width" value="1920" />
<option name="height" value="1080" />
<option name="height" value="1057" />
</component>
<component name="ProjectLevelVcsManager" settingsEditedManually="true" />
<component name="ProjectView">
......@@ -199,7 +235,7 @@
</list>
</option>
</component>
<component name="RunManager" selected="Python tests.Unittests in case_om_distribution_list.py">
<component name="RunManager" selected="Python tests.Unittests in case_hera_customer_pool.py">
<configuration name="Unittests for case_om_distribution_list.case" type="tests" factoryName="Unittests" temporary="true" nameIsGenerated="true">
<module name="gm-zhuanzhen-test" />
<option name="INTERPRETER_OPTIONS" value="" />
......@@ -277,11 +313,11 @@
</configuration>
<recent_temporary>
<list>
<item itemvalue="Python tests.Unittests in case_hera_customer_pool.py" />
<item itemvalue="Python tests.Unittests in case_om_distribution_list.py" />
<item itemvalue="Python tests.Unittests for case_om_distribution_list.case.test_01_distribution_list" />
<item itemvalue="Python tests.Unittests for case_om_distribution_list.case" />
<item itemvalue="Python tests.Unittests in case_hera_modify.py" />
<item itemvalue="Python tests.Unittests in case_hera_customer_pool.py" />
</list>
</recent_temporary>
</component>
......@@ -307,7 +343,8 @@
<workItem from="1623119010764" duration="13341000" />
<workItem from="1623737728653" duration="28000" />
<workItem from="1626079439429" duration="1379000" />
<workItem from="1628248246990" duration="9056000" />
<workItem from="1628248246990" duration="9177000" />
<workItem from="1628576843797" duration="11742000" />
</task>
<task id="LOCAL-00001" summary="测试git联通">
<created>1614849671013</created>
......@@ -407,43 +444,57 @@
<option name="project" value="LOCAL" />
<updated>1614937222959</updated>
</task>
<option name="localTasksCounter" value="15" />
<task id="LOCAL-00015" summary="om后台接口提交">
<created>1628498546581</created>
<option name="number" value="00015" />
<option name="presentableId" value="LOCAL-00015" />
<option name="project" value="LOCAL" />
<updated>1628498546581</updated>
</task>
<task id="LOCAL-00016" summary="666">
<created>1628677506817</created>
<option name="number" value="00016" />
<option name="presentableId" value="LOCAL-00016" />
<option name="project" value="LOCAL" />
<updated>1628677506818</updated>
</task>
<option name="localTasksCounter" value="17" />
<servers />
</component>
<component name="TestHistory">
<history-entry file="Unittests_for_case_om_distribution_list_case - 2021.08.09 at 14h 20m 34s.xml">
<configuration name="Unittests for case_om_distribution_list.case" configurationId="tests" />
</history-entry>
<history-entry file="Unittests_for_case_om_distribution_list_case - 2021.08.09 at 14h 21m 07s.xml">
<configuration name="Unittests for case_om_distribution_list.case" configurationId="tests" />
</history-entry>
<history-entry file="Unittests_in_case_om_distribution_list_py - 2021.08.09 at 14h 23m 01s.xml">
<history-entry file="Unittests_in_case_om_distribution_list_py - 2021.08.10 at 18h 49m 40s.xml">
<configuration name="Unittests in case_om_distribution_list.py" configurationId="tests" />
</history-entry>
<history-entry file="Unittests_for_case_om_distribution_list_case_test_01_distribution_list - 2021.08.09 at 14h 23m 14s.xml">
<configuration name="Unittests for case_om_distribution_list.case.test_01_distribution_list" configurationId="tests" />
</history-entry>
<history-entry file="Unittests_in_case_om_distribution_list_py - 2021.08.09 at 14h 23m 26s.xml">
<history-entry file="Unittests_in_case_om_distribution_list_py - 2021.08.10 at 18h 55m 07s.xml">
<configuration name="Unittests in case_om_distribution_list.py" configurationId="tests" />
</history-entry>
<history-entry file="Unittests_in_case_om_distribution_list_py - 2021.08.09 at 14h 23m 31s.xml">
<history-entry file="Unittests_in_case_om_distribution_list_py - 2021.08.10 at 18h 55m 50s.xml">
<configuration name="Unittests in case_om_distribution_list.py" configurationId="tests" />
</history-entry>
<history-entry file="Unittests_in_case_om_distribution_list_py - 2021.08.09 at 14h 24m 59s.xml">
<history-entry file="Unittests_in_case_om_distribution_list_py - 2021.08.10 at 19h 12m 08s.xml">
<configuration name="Unittests in case_om_distribution_list.py" configurationId="tests" />
</history-entry>
<history-entry file="Unittests_in_case_om_distribution_list_py - 2021.08.09 at 15h 11m 31s.xml">
<history-entry file="Unittests_in_case_om_distribution_list_py - 2021.08.10 at 19h 12m 39s.xml">
<configuration name="Unittests in case_om_distribution_list.py" configurationId="tests" />
</history-entry>
<history-entry file="Unittests_in_case_om_distribution_list_py - 2021.08.09 at 15h 12m 12s.xml">
<history-entry file="Unittests_in_case_om_distribution_list_py - 2021.08.10 at 19h 13m 16s.xml">
<configuration name="Unittests in case_om_distribution_list.py" configurationId="tests" />
</history-entry>
<history-entry file="Unittests_in_case_om_distribution_list_py - 2021.08.09 at 16h 41m 44s.xml">
<configuration name="Unittests in case_om_distribution_list.py" configurationId="tests" />
<history-entry file="Unittests_in_case_hera_customer_pool_py - 2021.08.11 at 15h 13m 41s.xml">
<configuration name="Unittests in case_hera_customer_pool.py" configurationId="tests" />
</history-entry>
<history-entry file="Unittests_in_case_hera_customer_pool_py - 2021.08.11 at 18h 01m 41s.xml">
<configuration name="Unittests in case_hera_customer_pool.py" configurationId="tests" />
</history-entry>
<history-entry file="Unittests_in_case_hera_customer_pool_py - 2021.08.11 at 18h 10m 06s.xml">
<configuration name="Unittests in case_hera_customer_pool.py" configurationId="tests" />
</history-entry>
<history-entry file="Unittests_in_case_hera_customer_pool_py - 2021.08.11 at 18h 16m 54s.xml">
<configuration name="Unittests in case_hera_customer_pool.py" configurationId="tests" />
</history-entry>
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="98939000" />
<option name="totallyTimeSpent" value="110802000" />
</component>
<component name="TodoView">
<todo-panel id="selected-file">
......@@ -459,21 +510,21 @@
<editor active="true" />
<layout>
<window_info id="Favorites" order="0" side_tool="true" />
<window_info content_ui="combo" id="Project" order="1" visible="true" weight="0.14376996" />
<window_info active="true" content_ui="combo" id="Project" order="1" visible="true" weight="0.1773163" />
<window_info id="Structure" order="2" side_tool="true" weight="0.25" />
<window_info anchor="bottom" id="Database Changes" order="0" />
<window_info anchor="bottom" id="Terminal" order="1" weight="0.47425744" />
<window_info anchor="bottom" id="Terminal" order="1" weight="0.47357512" />
<window_info anchor="bottom" id="Event Log" order="2" side_tool="true" />
<window_info anchor="bottom" id="Version Control" order="3" />
<window_info anchor="bottom" id="Python Console" order="4" />
<window_info anchor="bottom" id="Docker" order="5" show_stripe_button="false" />
<window_info anchor="bottom" id="Message" order="6" />
<window_info anchor="bottom" id="Find" order="7" weight="0.32952926" />
<window_info anchor="bottom" id="Run" order="8" weight="0.6673575" />
<window_info anchor="bottom" id="Run" order="8" weight="0.3865285" />
<window_info anchor="bottom" id="Debug" order="9" weight="0.3990099" />
<window_info anchor="bottom" id="Cvs" order="10" weight="0.25" />
<window_info anchor="bottom" id="Inspection" order="11" weight="0.4" />
<window_info anchor="bottom" id="TODO" order="12" weight="0.32970297" />
<window_info anchor="bottom" id="TODO" order="12" weight="0.32953367" />
<window_info anchor="right" id="Database" order="0" />
<window_info anchor="right" id="Commander" internal_type="SLIDING" order="1" type="SLIDING" weight="0.4" />
<window_info anchor="right" id="SciView" order="2" />
......@@ -495,7 +546,9 @@
<MESSAGE value="全上传代码" />
<MESSAGE value="测试jenkins" />
<MESSAGE value="最终版本代码提交" />
<option name="LAST_COMMIT_MESSAGE" value="最终版本代码提交" />
<MESSAGE value="om后台接口提交" />
<MESSAGE value="666" />
<option name="LAST_COMMIT_MESSAGE" value="666" />
</component>
<component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/assert_page/qiniu.py" />
......@@ -569,16 +622,6 @@
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/interface/demo.py" />
<entry file="file://$PROJECT_DIR$/allcase.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="453">
<caret line="132" column="35" lean-forward="true" selection-start-line="132" selection-start-column="35" selection-end-line="132" selection-end-column="35" />
<folding>
<element signature="e#15#30#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file:///usr/local/Cellar/python/3.7.4_1/Frameworks/Python.framework/Versions/3.7/lib/python3.7/ntpath.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-556">
......@@ -599,72 +642,79 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/case/demo.py">
<entry file="file://$PROJECT_DIR$/case/demo.py" />
<entry file="file://$PROJECT_DIR$/interface/interface.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="207">
<caret line="9" lean-forward="true" selection-start-line="9" selection-end-line="9" />
<state relative-caret-position="368">
<caret line="16" column="50" lean-forward="true" selection-start-line="16" selection-start-column="50" selection-end-line="16" selection-end-column="50" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/case/case_hera_modify.py">
<entry file="file://$USER_HOME$/Library/Caches/PyCharm2018.3/python_stubs/1305638948/builtins.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="460">
<caret line="29" column="45" lean-forward="true" selection-start-line="29" selection-start-column="45" selection-end-line="29" selection-end-column="45" />
<folding>
<element signature="e#0#15#0" expanded="true" />
</folding>
<state relative-caret-position="233">
<caret line="180" column="11" selection-start-line="180" selection-start-column="4" selection-end-line="180" selection-end-column="11" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/case/case_hera_customer_pool.py">
<entry file="file://$PROJECT_DIR$/case/__init__.py">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/case/case_hera_modify.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="441">
<caret line="38" column="40" selection-start-line="38" selection-start-column="40" selection-end-line="38" selection-end-column="40" />
<state relative-caret-position="514">
<caret line="30" column="16" selection-start-line="30" selection-start-column="9" selection-end-line="30" selection-end-column="16" />
<folding>
<element signature="e#0#15#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/interface/interface.py">
<entry file="file:///usr/local/Cellar/python/3.7.4_1/Frameworks/Python.framework/Versions/3.7/lib/python3.7/unittest/case.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="368">
<caret line="16" column="50" lean-forward="true" selection-start-line="16" selection-start-column="50" selection-end-line="16" selection-end-column="50" />
<state relative-caret-position="177">
<caret line="692" selection-start-line="692" selection-end-line="692" />
</state>
</provider>
</entry>
<entry file="file:///usr/local/Cellar/python/3.7.4_1/Frameworks/Python.framework/Versions/3.7/lib/python3.7/unittest/case.py">
<entry file="file://$PROJECT_DIR$/test_yaml/modify.yaml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="205">
<caret line="58" selection-start-line="58" selection-end-line="58" />
<state relative-caret-position="368">
<caret line="16" column="15" lean-forward="true" selection-start-line="16" selection-start-column="15" selection-end-line="16" selection-end-column="15" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/test_yaml/modify.yaml">
<entry file="file://$PROJECT_DIR$/test_yaml/zhuanzhen_celue.yaml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="667">
<caret line="29" lean-forward="true" selection-start-line="29" selection-end-line="29" />
<state relative-caret-position="322">
<caret line="14" column="11" lean-forward="true" selection-start-line="14" selection-start-column="11" selection-end-line="14" selection-end-column="11" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/test_yaml/customer_pool.yaml">
<entry file="file://$PROJECT_DIR$/case/case_om_distribution_list.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-2140">
<caret line="28" column="40" lean-forward="true" selection-start-line="28" selection-start-column="40" selection-end-line="28" selection-end-column="40" />
<state relative-caret-position="156">
<caret line="24" column="13" lean-forward="true" selection-start-line="24" selection-start-column="13" selection-end-line="24" selection-end-column="13" />
<folding>
<element signature="e#0#15#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$USER_HOME$/Library/Caches/PyCharm2018.3/python_stubs/1305638948/builtins.py">
<entry file="file://$PROJECT_DIR$/case/case_hera_celue_test.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="233">
<caret line="180" column="11" selection-start-line="180" selection-start-column="4" selection-end-line="180" selection-end-column="11" />
<state relative-caret-position="148">
<caret line="50" column="54" lean-forward="true" selection-start-line="50" selection-start-column="54" selection-end-line="50" selection-end-column="54" />
<folding>
<element signature="e#0#15#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/case/case_hera_celue_test.py">
<entry file="file://$PROJECT_DIR$/case/case_hera_customer_pool.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="158">
<caret line="16" column="50" selection-start-line="16" selection-start-column="50" selection-end-line="16" selection-end-column="50" />
<state relative-caret-position="119">
<caret line="24" column="1" lean-forward="true" selection-start-line="24" selection-start-column="1" selection-end-line="24" selection-end-column="1" />
<folding>
<element signature="e#0#15#0" expanded="true" />
</folding>
......@@ -673,24 +723,24 @@
</entry>
<entry file="file://$PROJECT_DIR$/test_yaml/om_distribution.yaml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="253">
<caret line="11" lean-forward="true" selection-start-line="11" selection-end-line="11" />
<state relative-caret-position="334">
<caret line="189" column="13" lean-forward="true" selection-start-line="189" selection-start-column="13" selection-end-line="189" selection-end-column="13" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/test_yaml/zhuanzhen_celue.yaml">
<entry file="file://$PROJECT_DIR$/test_yaml/customer_pool.yaml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="529">
<caret line="23" lean-forward="true" selection-start-line="23" selection-end-line="23" />
<state relative-caret-position="249">
<caret line="744" column="47" lean-forward="true" selection-start-line="744" selection-start-column="47" selection-end-line="744" selection-end-column="47" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/case/case_om_distribution_list.py">
<entry file="file://$PROJECT_DIR$/allcase.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="483">
<caret line="21" column="24" lean-forward="true" selection-start-line="21" selection-start-column="24" selection-end-line="21" selection-end-column="24" />
<state relative-caret-position="574">
<caret line="167" column="33" lean-forward="true" selection-start-line="167" selection-start-column="33" selection-end-line="167" selection-end-column="33" />
<folding>
<element signature="e#0#15#0" expanded="true" />
<element signature="e#15#30#0" expanded="true" />
</folding>
</state>
</provider>
......
......@@ -135,44 +135,44 @@ if __name__ == "__main__":
# 生成测试报告的路径
error_count,failure_count = run_case(all_case) # 2执行用例
bug_number = int(error_count) + int(failure_count)
if bug_number!=0:
# 获取最新的测试报告文件
report_path = os.path.join(cur_path, "report") # 用例文件夹
report_file = get_report_file(report_path) # 3获取最新的测试报告
# #邮箱配置 发送邮箱的地址
# sender = "l709188456@163.com"
sender = "liubingyin@igengmei.com"
#邮箱密码
#psw = "3328378"
psw = "cgBP3fw2ZNgp3L5r"
# 163服务器的servers
#smtp_server = "smtp.163.com"
#公司地址的服务器server
smtp_server = "smtp.exmail.qq.com"
port = 465
#发给谁的邮箱
receiver = ["liubingyin@igengmei.com", "chenxiangxiang@igengmei.com"]
send_mail(sender, psw, receiver, smtp_server, report_file, port) # 4最后一步发送报告
dd_url = "https://oapi.dingtalk.com/robot/send?access_token=4aa12245f7b6c273dde43c4a547b386cd12dc59f22a475f2efbd494094be15b9"
text = "监控报警:接口出现异常,请查看邮件排查问题"
json_text = {
"msgtype": "text",
"at": {
"atMobiles": [
# 变为所有人 这里要改
"all"
],
# 变为true 就会@所有人
#"isAtAll": False
"isAtAll": True
},
"text": {
"content": text
}
}
requests.post(url=dd_url, json=json_text, verify=False)
else:
print("无问题 不发送测试报告哦")
# if bug_number!=0:
# # 获取最新的测试报告文件
# report_path = os.path.join(cur_path, "report") # 用例文件夹
#
# report_file = get_report_file(report_path) # 3获取最新的测试报告
# # #邮箱配置 发送邮箱的地址
# # sender = "l709188456@163.com"
# sender = "liubingyin@igengmei.com"
# #邮箱密码
# #psw = "3328378"
# psw = "cgBP3fw2ZNgp3L5r"
# # 163服务器的servers
# #smtp_server = "smtp.163.com"
# #公司地址的服务器server
# smtp_server = "smtp.exmail.qq.com"
# port = 465
# #发给谁的邮箱
# receiver = ["liubingyin@igengmei.com", "chenxiangxiang@igengmei.com"]
# send_mail(sender, psw, receiver, smtp_server, report_file, port) # 4最后一步发送报告
# dd_url = "https://oapi.dingtalk.com/robot/send?access_token=4aa12245f7b6c273dde43c4a547b386cd12dc59f22a475f2efbd494094be15b9"
# text = "监控报警:接口出现异常,请查看邮件排查问题"
# json_text = {
# "msgtype": "text",
# "at": {
# "atMobiles": [
# # 变为所有人 这里要改
# "all"
# ],
# # 变为true 就会@所有人
# #"isAtAll": False
# "isAtAll": True
# },
# "text": {
# "content": text
# }
# }
#
# requests.post(url=dd_url, json=json_text, verify=False)
#
# else:
# print("无问题 不发送测试报告哦")
......@@ -40,6 +40,7 @@ class Case(unittest.TestCase):
cookies = interface.hera_cookies
result = requests.post(url=URL, cookies=cookiejar_from_dict(cookies), data=body, verify=False)
res = result.json()
print("实际返回数据:开始")
pprint(res)
print("实际返回数据:结束")
......@@ -56,3 +57,6 @@ class Case(unittest.TestCase):
......@@ -53,3 +53,6 @@ class Case(unittest.TestCase):
assertmethod = getattr(self, v[i][0])
assertmethod(res_response, v[i][1])
......@@ -29,7 +29,7 @@ print("所有数据列表陈列:结束"+ '\n')
class case(unittest.TestCase):
@data(*file3)
def test_01_distribution_list(self,contents):
'om后台客服客户池已分配客户列表接口'
'om后台客服客户池客户列表接口'
URL = interface.om_host + interface.om_distribution_list
body = contents.get("request").get("body")
cookies = interface.om_cookies
......@@ -42,6 +42,7 @@ class case(unittest.TestCase):
for k, v in response.items():
# k是配置参数里面的路径 通过k设定 去res里面找到实际的数据。 由于jsonpath返回的是一个列表 所以要用【0】处理。返回回去的就是一个取出来的数值 eg:"data.0.doctor_id"
print(res,k)
res_response = jsonpath.jsonpath(res, k)[0]
v = eval(v)
# assertmethod = self.assertEqual/self.assertIsInstance 取决于上面参数内写的是什么方法。 作用: getattr(object, name) = object.name
......
......@@ -14,7 +14,7 @@
columns[1][searchable]: true
columns[1][orderable]: true
columns[1][search][value]:
columns[1][search][regex]: false
columns[1][search][regex]: falsem
columns[2][data]: client_id
columns[2][name]: client_id
columns[2][searchable]: true
......
#已分配线索列表
-
request:
body:
......@@ -8,4 +9,199 @@
data.kefu_list[0].assigner: (("assertIsInstance",(str,)),("assertNotEqual",""))
data.kefu_list[1].assigner: (("assertIsInstance",(str,)),("assertNotEqual",""))
data.kefu_list[2].assigner: (("assertIsInstance",(str,)),("assertNotEqual",""))
data.kefu_list[0].creator: (("assertIsInstance",(str,)),("assertNotEqual",""))
data.kefu_list[1].creator: (("assertIsInstance",(str,)),("assertNotEqual",""))
data.kefu_list[2].creator: (("assertIsInstance",(str,)),("assertNotEqual",""))
data.kefu_list[0].current_follow_up_consultant_name: (("assertIsInstance",(str,)),("assertNotEqual",""))
data.kefu_list[1].current_follow_up_consultant_name: (("assertIsInstance",(str,)),("assertNotEqual",""))
data.kefu_list[2].current_follow_up_consultant_name: (("assertIsInstance",(str,)),("assertNotEqual",""))
#三天外公共池线索列表
-
request:
body:
bdtransfer_type: 2
page: 1
size: 20
response:
data.kefu_list[0].creator: (("assertIsInstance",(str,)),("assertNotEqual",""))
data.kefu_list[1].creator: (("assertIsInstance",(str,)),("assertNotEqual",""))
data.kefu_list[2].creator: (("assertIsInstance",(str,)),("assertNotEqual",""))
# 线索搜索模块
-
request:
body:
bdtransfer_type: 2
page: 1
size: 20
value: 转诊自动化测试数据-不要做任何改动
type: user_name
response:
msg: (("assertIsInstance",(str,)),("assertEqual","success"))
data.kefu_list[0].city: (("assertIsInstance",(str,)),("assertEqual","阿坝"))
data.kefu_list[0].creator: (("assertIsInstance",(str,)),("assertEqual","yilingxiao"))
data.kefu_list[0].id: (("assertIsInstance",(int,)),("assertEqual",3902))
data.kefu_list[0].user: (("assertIsInstance",(str,)),("assertEqual","转诊自动化测试数据-不要做任何改动"))
data.kefu_list[0].user_phone: (("assertIsInstance",(str,)),("assertEqual","34655667790"))
data.kefu_list[0].wechat: (("assertIsInstance",(str,)),("assertEqual","testont"))
-
request:
body:
bdtransfer_type: 2
page: 1
size: 20
value: 3902
type: id
response:
msg: (("assertIsInstance",(str,)),("assertEqual","success"))
data.kefu_list[0].city: (("assertIsInstance",(str,)),("assertEqual","阿坝"))
data.kefu_list[0].creator: (("assertIsInstance",(str,)),("assertEqual","yilingxiao"))
data.kefu_list[0].id: (("assertIsInstance",(int,)),("assertEqual",3902))
data.kefu_list[0].user: (("assertIsInstance",(str,)),("assertEqual","转诊自动化测试数据-不要做任何改动"))
data.kefu_list[0].user_phone: (("assertIsInstance",(str,)),("assertEqual","34655667790"))
data.kefu_list[0].wechat: (("assertIsInstance",(str,)),("assertEqual","testont"))
-
request:
body:
bdtransfer_type: 2
page: 1
size: 20
value: CU7DT5
type: client_id
response:
msg: (("assertIsInstance",(str,)),("assertEqual","success"))
data.kefu_list[0].city: (("assertIsInstance",(str,)),("assertEqual","阿坝"))
data.kefu_list[0].creator: (("assertIsInstance",(str,)),("assertEqual","yilingxiao"))
data.kefu_list[0].id: (("assertIsInstance",(int,)),("assertEqual",3902))
data.kefu_list[0].user: (("assertIsInstance",(str,)),("assertEqual","转诊自动化测试数据-不要做任何改动"))
data.kefu_list[0].user_phone: (("assertIsInstance",(str,)),("assertEqual","34655667790"))
data.kefu_list[0].wechat: (("assertIsInstance",(str,)),("assertEqual","testont"))
-
request:
body:
bdtransfer_type: 2
page: 1
size: 20
value: 34655667790
type: call_phone
response:
msg: (("assertIsInstance",(str,)),("assertEqual","success"))
data.kefu_list[0].city: (("assertIsInstance",(str,)),("assertEqual","阿坝"))
data.kefu_list[0].creator: (("assertIsInstance",(str,)),("assertEqual","yilingxiao"))
data.kefu_list[0].id: (("assertIsInstance",(int,)),("assertEqual",3902))
data.kefu_list[0].user: (("assertIsInstance",(str,)),("assertEqual","转诊自动化测试数据-不要做任何改动"))
data.kefu_list[0].user_phone: (("assertIsInstance",(str,)),("assertEqual","34655667790"))
data.kefu_list[0].wechat: (("assertIsInstance",(str,)),("assertEqual","testont"))
-
request:
body:
bdtransfer_type: 2
page: 1
size: 20
value: testont
type: wechat
response:
msg: (("assertIsInstance",(str,)),("assertEqual","success"))
data.kefu_list[0].city: (("assertIsInstance",(str,)),("assertEqual","阿坝"))
data.kefu_list[0].creator: (("assertIsInstance",(str,)),("assertEqual","yilingxiao"))
data.kefu_list[0].id: (("assertIsInstance",(int,)),("assertEqual",3902))
data.kefu_list[0].user: (("assertIsInstance",(str,)),("assertEqual","转诊自动化测试数据-不要做任何改动"))
data.kefu_list[0].user_phone: (("assertIsInstance",(str,)),("assertEqual","34655667790"))
data.kefu_list[0].wechat: (("assertIsInstance",(str,)),("assertEqual","testont"))
-
request:
body:
bdtransfer_type: 2
page: 1
size: 20
value: testont
type: wechat
response:
msg: (("assertIsInstance",(str,)),("assertEqual","success"))
data.kefu_list[0].city: (("assertIsInstance",(str,)),("assertEqual","阿坝"))
data.kefu_list[0].creator: (("assertIsInstance",(str,)),("assertEqual","yilingxiao"))
data.kefu_list[0].id: (("assertIsInstance",(int,)),("assertEqual",3902))
data.kefu_list[0].user: (("assertIsInstance",(str,)),("assertEqual","转诊自动化测试数据-不要做任何改动"))
data.kefu_list[0].user_phone: (("assertIsInstance",(str,)),("assertEqual","34655667790"))
data.kefu_list[0].wechat: (("assertIsInstance",(str,)),("assertEqual","testont"))
-
request:
body:
bdtransfer_type: 2
page: 1
size: 20
value: yilingxiao
type: creator
response:
msg: (("assertIsInstance",(str,)),("assertEqual","success"))
data.kefu_list[0].city: (("assertIsInstance",(str,)),("assertEqual","阿坝"))
data.kefu_list[0].creator: (("assertIsInstance",(str,)),("assertEqual","yilingxiao"))
data.kefu_list[0].id: (("assertIsInstance",(int,)),("assertEqual",3902))
data.kefu_list[0].user: (("assertIsInstance",(str,)),("assertEqual","转诊自动化测试数据-不要做任何改动"))
data.kefu_list[0].user_phone: (("assertIsInstance",(str,)),("assertEqual","34655667790"))
data.kefu_list[0].wechat: (("assertIsInstance",(str,)),("assertEqual","testont"))
-
request:
body:
bdtransfer_type: 1
page: 1
size: 20
create_status: 0
response:
code: 0
msg: success
-
request:
body:
bdtransfer_type: 1
page: 1
size: 20
create_status: 1
response:
code: 0
msg: success
-
request:
body:
bdtransfer_type: 1
page: 1
size: 20
create_status: 2
response:
code: 0
msg: success
-
request:
body:
bdtransfer_type: 1
page: 1
size: 20
create_status: 3
response:
code: 0
msg: success
{"last_check":"2021-05-27T02:36:08Z","pypi_version":"21.1.2"}
\ No newline at end of file
{"last_check":"2021-08-11T10:30:11Z","pypi_version":"21.2.3"}
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment