biqiao / ApiTest

Download as
Browse Code ยป

Commit 5c055c6c22b4d7d10b7357eded9c0c0be8021f39

Authored by biqiao
1 parent 70414ae9b2
Exists in master

update pymysql connect time out setting

Showing 5 changed files with 64 additions and 113 deletions   Show diff stats
.idea/workspace.xml
Diff comments   View file @5c055c6
... ... @@ -2,7 +2,9 @@
2 2 <project version="4">
3 3 <component name="ChangeListManager">
4 4 <list default="true" id="33187cb8-da74-4b13-8a55-31c4cae60a20" name="Default" comment="">
5   - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/test_cases/register.py" afterPath="$PROJECT_DIR$/test_cases/register.py" />
  5 + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
  6 + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/data_fixture/mysql_db.py" afterPath="$PROJECT_DIR$/data_fixture/mysql_db.py" />
  7 + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/report/test_report.html" afterPath="$PROJECT_DIR$/report/test_report.html" />
6 8 </list>
7 9 <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
8 10 <option name="TRACKING_ENABLED" value="true" />
... ... @@ -28,27 +30,37 @@
28 30 </component>
29 31 <component name="FileEditorManager">
30 32 <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
31   - <file leaf-file-name="mysql_db.py" pinned="false" current-in-tab="false">
  33 + <file leaf-file-name="mysql_db.py" pinned="false" current-in-tab="true">
32 34 <entry file="file://$PROJECT_DIR$/data_fixture/mysql_db.py">
33 35 <provider selected="true" editor-type-id="text-editor">
34   - <state relative-caret-position="51">
35   - <caret line="3" column="0" lean-forward="false" selection-start-line="3" selection-start-column="0" selection-end-line="3" selection-end-column="0" />
  36 + <state relative-caret-position="358">
  37 + <caret line="38" column="48" lean-forward="true" selection-start-line="38" selection-start-column="48" selection-end-line="38" selection-end-column="48" />
36 38 <folding>
37 39 <element signature="e#47#66#0" expanded="true" />
38   - <marker date="1514616463000" expanded="true" signature="1672:1692" ph="select * fro... " />
39   - <marker date="1514616463000" expanded="true" signature="1672:1694" ph="select * fro... missing_value" />
40   - <marker date="1514616463000" expanded="true" signature="1672:1718" ph="select count... missing_value" />
41   - <marker date="1514616463000" expanded="true" signature="1672:1719" ph="select count... missing_value" />
  40 + <marker date="1515742817000" expanded="true" signature="1735:1755" ph="select * fro... " />
  41 + <marker date="1515742817000" expanded="true" signature="1735:1757" ph="select * fro... missing_value" />
  42 + <marker date="1515742817000" expanded="true" signature="1735:1781" ph="select count... missing_value" />
  43 + <marker date="1515742817000" expanded="true" signature="1735:1782" ph="select count... missing_value" />
42 44 </folding>
43 45 </state>
44 46 </provider>
45 47 </entry>
46 48 </file>
47   - <file leaf-file-name="register.py" pinned="false" current-in-tab="true">
  49 + <file leaf-file-name="config_data.py" pinned="false" current-in-tab="false">
  50 + <entry file="file://$PROJECT_DIR$/data_fixture/config_data.py">
  51 + <provider selected="true" editor-type-id="text-editor">
  52 + <state relative-caret-position="68">
  53 + <caret line="4" column="22" lean-forward="false" selection-start-line="4" selection-start-column="9" selection-end-line="4" selection-end-column="22" />
  54 + <folding />
  55 + </state>
  56 + </provider>
  57 + </entry>
  58 + </file>
  59 + <file leaf-file-name="register.py" pinned="false" current-in-tab="false">
48 60 <entry file="file://$PROJECT_DIR$/test_cases/register.py">
49 61 <provider selected="true" editor-type-id="text-editor">
50   - <state relative-caret-position="145">
51   - <caret line="14" column="8" lean-forward="true" selection-start-line="14" selection-start-column="8" selection-end-line="14" selection-end-column="8" />
  62 + <state relative-caret-position="459">
  63 + <caret line="27" column="55" lean-forward="true" selection-start-line="27" selection-start-column="55" selection-end-line="27" selection-end-column="55" />
52 64 <folding>
53 65 <element signature="e#47#62#0" expanded="true" />
54 66 </folding>
... ... @@ -160,16 +172,6 @@
160 172 </provider>
161 173 </entry>
162 174 </file>
163   - <file leaf-file-name="config_data.py" pinned="false" current-in-tab="false">
164   - <entry file="file://$PROJECT_DIR$/data_fixture/config_data.py">
165   - <provider selected="true" editor-type-id="text-editor">
166   - <state relative-caret-position="272">
167   - <caret line="16" column="0" lean-forward="true" selection-start-line="16" selection-start-column="0" selection-end-line="16" selection-end-column="0" />
168   - <folding />
169   - </state>
170   - </provider>
171   - </entry>
172   - </file>
173 175 </leaf>
174 176 </component>
175 177 <component name="FileTemplateManagerImpl">
... ... @@ -255,7 +257,6 @@
255 257 <option value="$PROJECT_DIR$/test_cases/sub_account.py" />
256 258 <option value="$PROJECT_DIR$/test_cases/personal_info.py" />
257 259 <option value="$PROJECT_DIR$/data_fixture/config_data.py" />
258   - <option value="$PROJECT_DIR$/data_fixture/mysql_db.py" />
259 260 <option value="$PROJECT_DIR$/test_cases/parent_space.py" />
260 261 <option value="$PROJECT_DIR$/test_cases/xueketongbu.py" />
261 262 <option value="$PROJECT_DIR$/test_cases/app_record_statistic.py" />
... ... @@ -266,6 +267,7 @@
266 267 <option value="$PROJECT_DIR$/test_cases/subject_sync.py" />
267 268 <option value="$PROJECT_DIR$/run_test.py" />
268 269 <option value="$PROJECT_DIR$/test_cases/register.py" />
  270 + <option value="$PROJECT_DIR$/data_fixture/mysql_db.py" />
269 271 </list>
270 272 </option>
271 273 </component>
... ... @@ -543,10 +545,10 @@
543 545 <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="18" selection-end-column="0" />
544 546 <folding>
545 547 <element signature="e#47#66#0" expanded="true" />
546   - <marker date="1514616463000" expanded="true" signature="1672:1692" ph="select * fro... " />
547   - <marker date="1514616463000" expanded="true" signature="1672:1694" ph="select * fro... missing_value" />
548   - <marker date="1514616463000" expanded="true" signature="1672:1718" ph="select count... missing_value" />
549   - <marker date="1514616463000" expanded="true" signature="1672:1719" ph="select count... missing_value" />
  548 + <marker date="1515742817000" expanded="true" signature="1735:1755" ph="select * fro... " />
  549 + <marker date="1515742817000" expanded="true" signature="1735:1757" ph="select * fro... missing_value" />
  550 + <marker date="1515742817000" expanded="true" signature="1735:1781" ph="select count... missing_value" />
  551 + <marker date="1515742817000" expanded="true" signature="1735:1782" ph="select count... missing_value" />
550 552 </folding>
551 553 </state>
552 554 </provider>
... ... @@ -581,10 +583,10 @@
581 583 <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="18" selection-end-column="0" />
582 584 <folding>
583 585 <element signature="e#47#66#0" expanded="true" />
584   - <marker date="1514616463000" expanded="true" signature="1672:1692" ph="select * fro... " />
585   - <marker date="1514616463000" expanded="true" signature="1672:1694" ph="select * fro... missing_value" />
586   - <marker date="1514616463000" expanded="true" signature="1672:1718" ph="select count... missing_value" />
587   - <marker date="1514616463000" expanded="true" signature="1672:1719" ph="select count... missing_value" />
  586 + <marker date="1515742817000" expanded="true" signature="1735:1755" ph="select * fro... " />
  587 + <marker date="1515742817000" expanded="true" signature="1735:1757" ph="select * fro... missing_value" />
  588 + <marker date="1515742817000" expanded="true" signature="1735:1781" ph="select count... missing_value" />
  589 + <marker date="1515742817000" expanded="true" signature="1735:1782" ph="select count... missing_value" />
588 590 </folding>
589 591 </state>
590 592 </provider>
... ... @@ -900,44 +902,44 @@
900 902 </state>
901 903 </provider>
902 904 </entry>
903   - <entry file="file://$PROJECT_DIR$/data_fixture/mysql_db.py">
  905 + <entry file="file://$PROJECT_DIR$/run_test.py">
904 906 <provider selected="true" editor-type-id="text-editor">
905   - <state relative-caret-position="51">
906   - <caret line="3" column="0" lean-forward="false" selection-start-line="3" selection-start-column="0" selection-end-line="3" selection-end-column="0" />
  907 + <state relative-caret-position="408">
  908 + <caret line="24" column="37" lean-forward="false" selection-start-line="24" selection-start-column="37" selection-end-line="24" selection-end-column="37" />
907 909 <folding>
908   - <element signature="e#47#66#0" expanded="true" />
909   - <marker date="1514616463000" expanded="true" signature="1672:1692" ph="select * fro... " />
910   - <marker date="1514616463000" expanded="true" signature="1672:1694" ph="select * fro... missing_value" />
911   - <marker date="1514616463000" expanded="true" signature="1672:1718" ph="select count... missing_value" />
912   - <marker date="1514616463000" expanded="true" signature="1672:1719" ph="select count... missing_value" />
  910 + <element signature="e#47#62#0" expanded="true" />
913 911 </folding>
914 912 </state>
915 913 </provider>
916 914 </entry>
917   - <entry file="file://$PROJECT_DIR$/data_fixture/config_data.py">
  915 + <entry file="file://$PROJECT_DIR$/test_cases/register.py">
918 916 <provider selected="true" editor-type-id="text-editor">
919   - <state relative-caret-position="272">
920   - <caret line="16" column="0" lean-forward="true" selection-start-line="16" selection-start-column="0" selection-end-line="16" selection-end-column="0" />
921   - <folding />
  917 + <state relative-caret-position="459">
  918 + <caret line="27" column="55" lean-forward="true" selection-start-line="27" selection-start-column="55" selection-end-line="27" selection-end-column="55" />
  919 + <folding>
  920 + <element signature="e#47#62#0" expanded="true" />
  921 + </folding>
922 922 </state>
923 923 </provider>
924 924 </entry>
925   - <entry file="file://$PROJECT_DIR$/run_test.py">
  925 + <entry file="file://$PROJECT_DIR$/data_fixture/config_data.py">
926 926 <provider selected="true" editor-type-id="text-editor">
927   - <state relative-caret-position="408">
928   - <caret line="24" column="37" lean-forward="false" selection-start-line="24" selection-start-column="37" selection-end-line="24" selection-end-column="37" />
929   - <folding>
930   - <element signature="e#47#62#0" expanded="true" />
931   - </folding>
  927 + <state relative-caret-position="68">
  928 + <caret line="4" column="22" lean-forward="false" selection-start-line="4" selection-start-column="9" selection-end-line="4" selection-end-column="22" />
  929 + <folding />
932 930 </state>
933 931 </provider>
934 932 </entry>
935   - <entry file="file://$PROJECT_DIR$/test_cases/register.py">
  933 + <entry file="file://$PROJECT_DIR$/data_fixture/mysql_db.py">
936 934 <provider selected="true" editor-type-id="text-editor">
937   - <state relative-caret-position="145">
938   - <caret line="14" column="8" lean-forward="true" selection-start-line="14" selection-start-column="8" selection-end-line="14" selection-end-column="8" />
  935 + <state relative-caret-position="358">
  936 + <caret line="38" column="48" lean-forward="true" selection-start-line="38" selection-start-column="48" selection-end-line="38" selection-end-column="48" />
939 937 <folding>
940   - <element signature="e#47#62#0" expanded="true" />
  938 + <element signature="e#47#66#0" expanded="true" />
  939 + <marker date="1515742817000" expanded="true" signature="1735:1755" ph="select * fro... " />
  940 + <marker date="1515742817000" expanded="true" signature="1735:1757" ph="select * fro... missing_value" />
  941 + <marker date="1515742817000" expanded="true" signature="1735:1781" ph="select count... missing_value" />
  942 + <marker date="1515742817000" expanded="true" signature="1735:1782" ph="select count... missing_value" />
941 943 </folding>
942 944 </state>
943 945 </provider>
... ...
data_fixture/mysql_db.py
Diff comments   View file @5c055c6
... ... @@ -29,6 +29,7 @@ class DB:
29 29 user=Data.DB_USERNAME,
30 30 password=Data.DB_PASSWORD,
31 31 charset='utf8mb4',
  32 + connect_timeout=3600,
32 33 cursorclass=pymysql.cursors.DictCursor
33 34 )
34 35 except pymysql.err.OperationalError as e:
... ...
report/test_report.html
Diff comments   View file @5c055c6
... ... @@ -189,9 +189,9 @@ function showOutput(id, name) {
189 189  
190 190 <div class='heading'>
191 191 <h1>Unit Test Report</h1>
192   -<p class='attribute'><strong>Start Time:</strong> 2018-01-08 18:05:31</p>
193   -<p class='attribute'><strong>Duration:</strong> 0:00:02.208474</p>
194   -<p class='attribute'><strong>Status:</strong> Pass 6</p>
  192 +<p class='attribute'><strong>Start Time:</strong> 2018-01-12 15:33:19</p>
  193 +<p class='attribute'><strong>Duration:</strong> 0:00:09.093848</p>
  194 +<p class='attribute'><strong>Status:</strong> Pass 1</p>
195 195  
196 196 <p class='description'></p>
197 197 </div>
... ... @@ -222,75 +222,23 @@ function showOutput(id, name) {
222 222 </tr>
223 223  
224 224 <tr class='passClass'>
225   - <td>subject_sync.ClassNameVideo</td>
226   - <td>2</td>
227   - <td>2</td>
228   - <td>0</td>
229   - <td>0</td>
230   - <td><a href="javascript:showClassDetail('c1',2)">Detail</a></td>
231   -</tr>
232   -
233   -<tr id='pt1.1' class='hiddenRow'>
234   - <td class='none'><div class='testcase'>test_ClassNameVideo_noData</div></td>
235   - <td colspan='5' align='center'>pass</td>
236   -</tr>
237   -
238   -<tr id='pt1.2' class='hiddenRow'>
239   - <td class='none'><div class='testcase'>test_ClassNameVideo_success</div></td>
240   - <td colspan='5' align='center'>pass</td>
241   -</tr>
242   -
243   -<tr class='passClass'>
244   - <td>subject_sync.ConsolidationExercise</td>
245   - <td>1</td>
246   - <td>1</td>
247   - <td>0</td>
248   - <td>0</td>
249   - <td><a href="javascript:showClassDetail('c2',1)">Detail</a></td>
250   -</tr>
251   -
252   -<tr id='pt2.1' class='hiddenRow'>
253   - <td class='none'><div class='testcase'>test_ConsolidationExercise_success</div></td>
254   - <td colspan='5' align='center'>pass</td>
255   -</tr>
256   -
257   -<tr class='passClass'>
258   - <td>subject_sync.PointVideo</td>
259   - <td>2</td>
260   - <td>2</td>
261   - <td>0</td>
262   - <td>0</td>
263   - <td><a href="javascript:showClassDetail('c3',2)">Detail</a></td>
264   -</tr>
265   -
266   -<tr id='pt3.1' class='hiddenRow'>
267   - <td class='none'><div class='testcase'>test_PointVideo_noData</div></td>
268   - <td colspan='5' align='center'>pass</td>
269   -</tr>
270   -
271   -<tr id='pt3.2' class='hiddenRow'>
272   - <td class='none'><div class='testcase'>test_PointVideo_success</div></td>
273   - <td colspan='5' align='center'>pass</td>
274   -</tr>
275   -
276   -<tr class='passClass'>
277   - <td>subject_sync.SubjectTest</td>
  225 + <td>test_cases.app_record_statistic.AppRecordEveryday</td>
278 226 <td>1</td>
279 227 <td>1</td>
280 228 <td>0</td>
281 229 <td>0</td>
282   - <td><a href="javascript:showClassDetail('c4',1)">Detail</a></td>
  230 + <td><a href="javascript:showClassDetail('c1',1)">Detail</a></td>
283 231 </tr>
284 232  
285   -<tr id='pt4.1' class='hiddenRow'>
286   - <td class='none'><div class='testcase'>test_SubjectTest_success</div></td>
  233 +<tr id='pt1.1' class='hiddenRow'>
  234 + <td class='none'><div class='testcase'>test_getAppRecordEveryday_success</div></td>
287 235 <td colspan='5' align='center'>pass</td>
288 236 </tr>
289 237  
290 238 <tr id='total_row'>
291 239 <td>Total</td>
292   - <td>6</td>
293   - <td>6</td>
  240 + <td>1</td>
  241 + <td>1</td>
294 242 <td>0</td>
295 243 <td>0</td>
296 244 <td>&nbsp;</td>
... ...
test_cases/__pycache__/register.cpython-36.pyc
Diff comments   View file @5c055c6
No preview for this file type
test_cases/__pycache__/subject_sync.cpython-36.pyc
Diff comments   View file @5c055c6
No preview for this file type