Commit 5126d28cf79eb0400090ceb04dec8cdf5ccc64d0
1 parent
1a958f7b36
Exists in
master
update test
Showing
2 changed files
with
78 additions
and
63 deletions
Show diff stats
.idea/workspace.xml
1 | 1 | <?xml version="1.0" encoding="UTF-8"?> |
2 | 2 | <project version="4"> |
3 | 3 | <component name="ChangeListManager"> |
4 | - <list default="true" id="33187cb8-da74-4b13-8a55-31c4cae60a20" name="Default" comment="" /> | |
4 | + <list default="true" id="33187cb8-da74-4b13-8a55-31c4cae60a20" name="Default" comment=""> | |
5 | + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" /> | |
6 | + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/run_test.py" afterPath="$PROJECT_DIR$/run_test.py" /> | |
7 | + </list> | |
5 | 8 | <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> |
6 | 9 | <option name="TRACKING_ENABLED" value="true" /> |
7 | 10 | <option name="SHOW_DIALOG" value="false" /> |
... | ... | @@ -29,9 +32,10 @@ |
29 | 32 | <file leaf-file-name="mysql_db.py" pinned="false" current-in-tab="false"> |
30 | 33 | <entry file="file://$PROJECT_DIR$/data_fixture/mysql_db.py"> |
31 | 34 | <provider selected="true" editor-type-id="text-editor"> |
32 | - <state relative-caret-position="34"> | |
33 | - <caret line="2" column="0" lean-forward="true" selection-start-line="2" selection-start-column="0" selection-end-line="2" selection-end-column="0" /> | |
35 | + <state relative-caret-position="51"> | |
36 | + <caret line="3" column="0" lean-forward="false" selection-start-line="3" selection-start-column="0" selection-end-line="3" selection-end-column="0" /> | |
34 | 37 | <folding> |
38 | + <element signature="e#47#66#0" expanded="true" /> | |
35 | 39 | <marker date="1514616463000" expanded="true" signature="1672:1692" ph="select * fro... " /> |
36 | 40 | <marker date="1514616463000" expanded="true" signature="1672:1694" ph="select * fro... missing_value" /> |
37 | 41 | <marker date="1514616463000" expanded="true" signature="1672:1718" ph="select count... missing_value" /> |
... | ... | @@ -44,8 +48,8 @@ |
44 | 48 | <file leaf-file-name="app_record_statistic.py" pinned="false" current-in-tab="false"> |
45 | 49 | <entry file="file://$PROJECT_DIR$/test_cases/app_record_statistic.py"> |
46 | 50 | <provider selected="true" editor-type-id="text-editor"> |
47 | - <state relative-caret-position="761"> | |
48 | - <caret line="170" column="45" lean-forward="false" selection-start-line="170" selection-start-column="45" selection-end-line="170" selection-end-column="45" /> | |
51 | + <state relative-caret-position="306"> | |
52 | + <caret line="18" column="53" lean-forward="true" selection-start-line="18" selection-start-column="53" selection-end-line="18" selection-end-column="53" /> | |
49 | 53 | <folding> |
50 | 54 | <element signature="e#47#62#0" expanded="true" /> |
51 | 55 | </folding> |
... | ... | @@ -56,8 +60,8 @@ |
56 | 60 | <file leaf-file-name="run_test.py" pinned="false" current-in-tab="true"> |
57 | 61 | <entry file="file://$PROJECT_DIR$/run_test.py"> |
58 | 62 | <provider selected="true" editor-type-id="text-editor"> |
59 | - <state relative-caret-position="289"> | |
60 | - <caret line="17" column="0" lean-forward="true" selection-start-line="17" selection-start-column="0" selection-end-line="17" selection-end-column="0" /> | |
63 | + <state relative-caret-position="408"> | |
64 | + <caret line="24" column="37" lean-forward="false" selection-start-line="24" selection-start-column="37" selection-end-line="24" selection-end-column="37" /> | |
61 | 65 | <folding> |
62 | 66 | <element signature="e#47#62#0" expanded="true" /> |
63 | 67 | </folding> |
... | ... | @@ -78,9 +82,11 @@ |
78 | 82 | <file leaf-file-name="subject_sync.py" pinned="false" current-in-tab="false"> |
79 | 83 | <entry file="file://$PROJECT_DIR$/test_cases/subject_sync.py"> |
80 | 84 | <provider selected="true" editor-type-id="text-editor"> |
81 | - <state relative-caret-position="85"> | |
82 | - <caret line="5" column="66" lean-forward="true" selection-start-line="5" selection-start-column="66" selection-end-line="5" selection-end-column="66" /> | |
83 | - <folding /> | |
85 | + <state relative-caret-position="204"> | |
86 | + <caret line="12" column="0" lean-forward="true" selection-start-line="12" selection-start-column="0" selection-end-line="12" selection-end-column="0" /> | |
87 | + <folding> | |
88 | + <element signature="e#47#62#0" expanded="true" /> | |
89 | + </folding> | |
84 | 90 | </state> |
85 | 91 | </provider> |
86 | 92 | </entry> |
... | ... | @@ -88,7 +94,7 @@ |
88 | 94 | <file leaf-file-name="create_testdata.py" pinned="false" current-in-tab="false"> |
89 | 95 | <entry file="file://$PROJECT_DIR$/data_fixture/create_testdata.py"> |
90 | 96 | <provider selected="true" editor-type-id="text-editor"> |
91 | - <state relative-caret-position="310"> | |
97 | + <state relative-caret-position="666"> | |
92 | 98 | <caret line="356" column="79" lean-forward="false" selection-start-line="356" selection-start-column="67" selection-end-line="356" selection-end-column="79" /> |
93 | 99 | <folding> |
94 | 100 | <element signature="e#47#83#0" expanded="true" /> |
... | ... | @@ -146,8 +152,8 @@ |
146 | 152 | <file leaf-file-name="config_data.py" pinned="false" current-in-tab="false"> |
147 | 153 | <entry file="file://$PROJECT_DIR$/data_fixture/config_data.py"> |
148 | 154 | <provider selected="true" editor-type-id="text-editor"> |
149 | - <state relative-caret-position="114"> | |
150 | - <caret line="12" column="14" lean-forward="false" selection-start-line="12" selection-start-column="14" selection-end-line="12" selection-end-column="14" /> | |
155 | + <state relative-caret-position="272"> | |
156 | + <caret line="16" column="0" lean-forward="true" selection-start-line="16" selection-start-column="0" selection-end-line="16" selection-end-column="0" /> | |
151 | 157 | <folding /> |
152 | 158 | </state> |
153 | 159 | </provider> |
... | ... | @@ -192,8 +198,8 @@ |
192 | 198 | <find>Data.DEVICE_NUMBER_CUS_BIND</find> |
193 | 199 | <find>SUB_ACC_</find> |
194 | 200 | <find>test_getAppRecordOneday_success</find> |
195 | - <find>get_parentSpace_password</find> | |
196 | 201 | <find>print</find> |
202 | + <find>get_parentSpace_password</find> | |
197 | 203 | </findStrings> |
198 | 204 | <replaceStrings> |
199 | 205 | <replace>app_pid</replace> |
... | ... | @@ -207,6 +213,9 @@ |
207 | 213 | <dir>$PROJECT_DIR$</dir> |
208 | 214 | </dirStrings> |
209 | 215 | </component> |
216 | + <component name="Git.Settings"> | |
217 | + <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" /> | |
218 | + </component> | |
210 | 219 | <component name="IdeDocumentHistory"> |
211 | 220 | <option name="CHANGED_PATHS"> |
212 | 221 | <list> |
... | ... | @@ -242,10 +251,10 @@ |
242 | 251 | <option value="$PROJECT_DIR$/test_cases/app_record_statistic.py" /> |
243 | 252 | <option value="$PROJECT_DIR$/data_fixture/create_testdata.py" /> |
244 | 253 | <option value="$PROJECT_DIR$/test_cases/debugggggg.py" /> |
245 | - <option value="$PROJECT_DIR$/run_test.py" /> | |
246 | 254 | <option value="$PROJECT_DIR$/test_cases/__init__.py" /> |
247 | 255 | <option value="$PROJECT_DIR$/data_fixture/__init__.py" /> |
248 | 256 | <option value="$PROJECT_DIR$/test_cases/subject_sync.py" /> |
257 | + <option value="$PROJECT_DIR$/run_test.py" /> | |
249 | 258 | </list> |
250 | 259 | </option> |
251 | 260 | </component> |
... | ... | @@ -261,6 +270,7 @@ |
261 | 270 | <option name="width" value="1920" /> |
262 | 271 | <option name="height" value="977" /> |
263 | 272 | </component> |
273 | + <component name="ProjectLevelVcsManager" settingsEditedManually="true" /> | |
264 | 274 | <component name="ProjectView"> |
265 | 275 | <navigator currentView="ProjectPane" proportions="" version="1"> |
266 | 276 | <flattenPackages /> |
... | ... | @@ -416,7 +426,7 @@ |
416 | 426 | <layout> |
417 | 427 | <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32993197" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" /> |
418 | 428 | <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.33" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" /> |
419 | - <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" /> | |
429 | + <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.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" /> | |
420 | 430 | <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.24829932" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" /> |
421 | 431 | <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.2857143" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" /> |
422 | 432 | <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32993197" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" /> |
... | ... | @@ -521,6 +531,7 @@ |
521 | 531 | <state relative-caret-position="0"> |
522 | 532 | <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="18" selection-end-column="0" /> |
523 | 533 | <folding> |
534 | + <element signature="e#47#66#0" expanded="true" /> | |
524 | 535 | <marker date="1514616463000" expanded="true" signature="1672:1692" ph="select * fro... " /> |
525 | 536 | <marker date="1514616463000" expanded="true" signature="1672:1694" ph="select * fro... missing_value" /> |
526 | 537 | <marker date="1514616463000" expanded="true" signature="1672:1718" ph="select count... missing_value" /> |
... | ... | @@ -558,6 +569,7 @@ |
558 | 569 | <state relative-caret-position="0"> |
559 | 570 | <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="18" selection-end-column="0" /> |
560 | 571 | <folding> |
572 | + <element signature="e#47#66#0" expanded="true" /> | |
561 | 573 | <marker date="1514616463000" expanded="true" signature="1672:1692" ph="select * fro... " /> |
562 | 574 | <marker date="1514616463000" expanded="true" signature="1672:1694" ph="select * fro... missing_value" /> |
563 | 575 | <marker date="1514616463000" expanded="true" signature="1672:1718" ph="select count... missing_value" /> |
... | ... | @@ -787,17 +799,53 @@ |
787 | 799 | </state> |
788 | 800 | </provider> |
789 | 801 | </entry> |
790 | - <entry file="file://$PROJECT_DIR$/data_fixture/config_data.py"> | |
802 | + <entry file="file://$PROJECT_DIR$/test_cases/debugggggg.py"> | |
803 | + <provider selected="true" editor-type-id="text-editor"> | |
804 | + <state relative-caret-position="34"> | |
805 | + <caret line="2" column="0" lean-forward="false" selection-start-line="2" selection-start-column="0" selection-end-line="2" selection-end-column="0" /> | |
806 | + <folding /> | |
807 | + </state> | |
808 | + </provider> | |
809 | + </entry> | |
810 | + <entry file="file://$PROJECT_DIR$/test_cases/__init__.py"> | |
791 | 811 | <provider selected="true" editor-type-id="text-editor"> |
792 | - <state relative-caret-position="114"> | |
793 | - <caret line="12" column="14" lean-forward="false" selection-start-line="12" selection-start-column="14" selection-end-line="12" selection-end-column="14" /> | |
812 | + <state relative-caret-position="0"> | |
813 | + <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> | |
794 | 814 | <folding /> |
795 | 815 | </state> |
796 | 816 | </provider> |
797 | 817 | </entry> |
818 | + <entry file="file://$PROJECT_DIR$/data_fixture/__init__.py"> | |
819 | + <provider selected="true" editor-type-id="text-editor"> | |
820 | + <state relative-caret-position="0"> | |
821 | + <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> | |
822 | + <folding /> | |
823 | + </state> | |
824 | + </provider> | |
825 | + </entry> | |
826 | + <entry file="file://$PROJECT_DIR$/test_cases/app_record_statistic.py"> | |
827 | + <provider selected="true" editor-type-id="text-editor"> | |
828 | + <state relative-caret-position="306"> | |
829 | + <caret line="18" column="53" lean-forward="true" selection-start-line="18" selection-start-column="53" selection-end-line="18" selection-end-column="53" /> | |
830 | + <folding> | |
831 | + <element signature="e#47#62#0" expanded="true" /> | |
832 | + </folding> | |
833 | + </state> | |
834 | + </provider> | |
835 | + </entry> | |
836 | + <entry file="file://$PROJECT_DIR$/test_cases/subject_sync.py"> | |
837 | + <provider selected="true" editor-type-id="text-editor"> | |
838 | + <state relative-caret-position="204"> | |
839 | + <caret line="12" column="0" lean-forward="true" selection-start-line="12" selection-start-column="0" selection-end-line="12" selection-end-column="0" /> | |
840 | + <folding> | |
841 | + <element signature="e#47#62#0" expanded="true" /> | |
842 | + </folding> | |
843 | + </state> | |
844 | + </provider> | |
845 | + </entry> | |
798 | 846 | <entry file="file://$PROJECT_DIR$/data_fixture/create_testdata.py"> |
799 | 847 | <provider selected="true" editor-type-id="text-editor"> |
800 | - <state relative-caret-position="310"> | |
848 | + <state relative-caret-position="666"> | |
801 | 849 | <caret line="356" column="79" lean-forward="false" selection-start-line="356" selection-start-column="67" selection-end-line="356" selection-end-column="79" /> |
802 | 850 | <folding> |
803 | 851 | <element signature="e#47#83#0" expanded="true" /> |
... | ... | @@ -851,45 +899,12 @@ |
851 | 899 | </state> |
852 | 900 | </provider> |
853 | 901 | </entry> |
854 | - <entry file="file://$PROJECT_DIR$/test_cases/debugggggg.py"> | |
855 | - <provider selected="true" editor-type-id="text-editor"> | |
856 | - <state relative-caret-position="34"> | |
857 | - <caret line="2" column="0" lean-forward="false" selection-start-line="2" selection-start-column="0" selection-end-line="2" selection-end-column="0" /> | |
858 | - <folding /> | |
859 | - </state> | |
860 | - </provider> | |
861 | - </entry> | |
862 | - <entry file="file://$PROJECT_DIR$/test_cases/app_record_statistic.py"> | |
863 | - <provider selected="true" editor-type-id="text-editor"> | |
864 | - <state relative-caret-position="761"> | |
865 | - <caret line="170" column="45" lean-forward="false" selection-start-line="170" selection-start-column="45" selection-end-line="170" selection-end-column="45" /> | |
866 | - <folding> | |
867 | - <element signature="e#47#62#0" expanded="true" /> | |
868 | - </folding> | |
869 | - </state> | |
870 | - </provider> | |
871 | - </entry> | |
872 | - <entry file="file://$PROJECT_DIR$/test_cases/__init__.py"> | |
873 | - <provider selected="true" editor-type-id="text-editor"> | |
874 | - <state relative-caret-position="0"> | |
875 | - <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> | |
876 | - <folding /> | |
877 | - </state> | |
878 | - </provider> | |
879 | - </entry> | |
880 | - <entry file="file://$PROJECT_DIR$/data_fixture/__init__.py"> | |
881 | - <provider selected="true" editor-type-id="text-editor"> | |
882 | - <state relative-caret-position="0"> | |
883 | - <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> | |
884 | - <folding /> | |
885 | - </state> | |
886 | - </provider> | |
887 | - </entry> | |
888 | 902 | <entry file="file://$PROJECT_DIR$/data_fixture/mysql_db.py"> |
889 | 903 | <provider selected="true" editor-type-id="text-editor"> |
890 | - <state relative-caret-position="34"> | |
891 | - <caret line="2" column="0" lean-forward="true" selection-start-line="2" selection-start-column="0" selection-end-line="2" selection-end-column="0" /> | |
904 | + <state relative-caret-position="51"> | |
905 | + <caret line="3" column="0" lean-forward="false" selection-start-line="3" selection-start-column="0" selection-end-line="3" selection-end-column="0" /> | |
892 | 906 | <folding> |
907 | + <element signature="e#47#66#0" expanded="true" /> | |
893 | 908 | <marker date="1514616463000" expanded="true" signature="1672:1692" ph="select * fro... " /> |
894 | 909 | <marker date="1514616463000" expanded="true" signature="1672:1694" ph="select * fro... missing_value" /> |
895 | 910 | <marker date="1514616463000" expanded="true" signature="1672:1718" ph="select count... missing_value" /> |
... | ... | @@ -898,18 +913,18 @@ |
898 | 913 | </state> |
899 | 914 | </provider> |
900 | 915 | </entry> |
901 | - <entry file="file://$PROJECT_DIR$/test_cases/subject_sync.py"> | |
916 | + <entry file="file://$PROJECT_DIR$/data_fixture/config_data.py"> | |
902 | 917 | <provider selected="true" editor-type-id="text-editor"> |
903 | - <state relative-caret-position="85"> | |
904 | - <caret line="5" column="66" lean-forward="true" selection-start-line="5" selection-start-column="66" selection-end-line="5" selection-end-column="66" /> | |
918 | + <state relative-caret-position="272"> | |
919 | + <caret line="16" column="0" lean-forward="true" selection-start-line="16" selection-start-column="0" selection-end-line="16" selection-end-column="0" /> | |
905 | 920 | <folding /> |
906 | 921 | </state> |
907 | 922 | </provider> |
908 | 923 | </entry> |
909 | 924 | <entry file="file://$PROJECT_DIR$/run_test.py"> |
910 | 925 | <provider selected="true" editor-type-id="text-editor"> |
911 | - <state relative-caret-position="289"> | |
912 | - <caret line="17" column="0" lean-forward="true" selection-start-line="17" selection-start-column="0" selection-end-line="17" selection-end-column="0" /> | |
926 | + <state relative-caret-position="408"> | |
927 | + <caret line="24" column="37" lean-forward="false" selection-start-line="24" selection-start-column="37" selection-end-line="24" selection-end-column="37" /> | |
913 | 928 | <folding> |
914 | 929 | <element signature="e#47#62#0" expanded="true" /> |
915 | 930 | </folding> | ... | ... |
run_test.py
... | ... | @@ -14,10 +14,10 @@ from test_cases import subject_sync |
14 | 14 | |
15 | 15 | start_dir = './test_cases' |
16 | 16 | suite_run = unittest.TestSuite() |
17 | -suite_run = unittest.defaultTestLoader.discover(start_dir=start_dir, pattern='subject_sync.py') | |
17 | +#suite_run = unittest.defaultTestLoader.discover(start_dir=start_dir, pattern='subject_sync.py') | |
18 | 18 | |
19 | 19 | |
20 | -#suite_run.addTest(app_record_statistic.AppRecordEveryday('test_getAppRecordEveryday_success')) | |
20 | +suite_run.addTest(app_record_statistic.AppRecordEveryday('test_getAppRecordEveryday_success')) | |
21 | 21 | |
22 | 22 | #suite_run.addTest(app_record_statistic.AppRecordReset('test_AppRecordReset_success')) |
23 | 23 | #suite_run.addTest(parent_space.ParentSpaceNewPassword('test_ParentSpaceNewPassword_success')) | ... | ... |