提交 4a2314fd911b958db698571b9acc7e295c8cf080

作者 Shishutong
1 个父辈 d5b27474

1.修改老师身份证信息

@@ -3,23 +3,7 @@ @@ -3,23 +3,7 @@
3 <component name="ChangeListManager"> 3 <component name="ChangeListManager">
4 <list default="true" id="129454fc-5415-4c7e-9855-d0293355ede5" name="Default Changelist" comment="1.run文件改回原来版本"> 4 <list default="true" id="129454fc-5415-4c7e-9855-d0293355ede5" name="Default Changelist" comment="1.run文件改回原来版本">
5 <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" /> 5 <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
6 - <change beforePath="$PROJECT_DIR$/data/Internship_manage/test_07_apply_audit.xlsx" beforeDir="false" afterPath="$PROJECT_DIR$/data/Internship_manage/test_07_apply_audit.xlsx" afterDir="false" />  
7 - <change beforePath="$PROJECT_DIR$/data/Internship_manage/test_08_log_marking.xlsx" beforeDir="false" afterPath="$PROJECT_DIR$/data/Internship_manage/test_08_log_marking.xlsx" afterDir="false" />  
8 - <change beforePath="$PROJECT_DIR$/data/Internship_manage/test_09_leave_record.xlsx" beforeDir="false" afterPath="$PROJECT_DIR$/data/Internship_manage/test_09_leave_record.xlsx" afterDir="false" />  
9 - <change beforePath="$PROJECT_DIR$/data/Internship_preparation/test_04_internship_plan.xlsx" beforeDir="false" afterPath="$PROJECT_DIR$/data/Internship_preparation/test_04_internship_plan.xlsx" afterDir="false" />  
10 - <change beforePath="$PROJECT_DIR$/data/Internship_preparation/test_05_internship_project.xlsx" beforeDir="false" afterPath="$PROJECT_DIR$/data/Internship_preparation/test_05_internship_project.xlsx" afterDir="false" />  
11 - <change beforePath="$PROJECT_DIR$/data/student_practice/test_06__practice.xlsx" beforeDir="false" afterPath="$PROJECT_DIR$/data/student_practice/test_06__practice.xlsx" afterDir="false" />  
12 - <change beforePath="$PROJECT_DIR$/data/system/test_02_department.xlsx" beforeDir="false" afterPath="$PROJECT_DIR$/data/system/test_02_department.xlsx" afterDir="false" />  
13 - <change beforePath="$PROJECT_DIR$/data/system/test_02_specialty.xlsx" beforeDir="false" afterPath="$PROJECT_DIR$/data/system/test_02_specialty.xlsx" afterDir="false" />  
14 - <change beforePath="$PROJECT_DIR$/data/system/test_02_term.xlsx" beforeDir="false" afterPath="$PROJECT_DIR$/data/system/test_02_term.xlsx" afterDir="false" />  
15 - <change beforePath="$PROJECT_DIR$/data/teaching_affairs/test_03_class.xlsx" beforeDir="false" afterPath="$PROJECT_DIR$/data/teaching_affairs/test_03_class.xlsx" afterDir="false" />  
16 - <change beforePath="$PROJECT_DIR$/data/teaching_affairs/test_03_course.xlsx" beforeDir="false" afterPath="$PROJECT_DIR$/data/teaching_affairs/test_03_course.xlsx" afterDir="false" />  
17 - <change beforePath="$PROJECT_DIR$/data/teaching_affairs/test_03_student.xlsx" beforeDir="false" afterPath="$PROJECT_DIR$/data/teaching_affairs/test_03_student.xlsx" afterDir="false" />  
18 - <change beforePath="$PROJECT_DIR$/data/teaching_affairs/test_03_teacher.xlsx" beforeDir="false" afterPath="$PROJECT_DIR$/data/teaching_affairs/test_03_teacher.xlsx" afterDir="false" />  
19 - <change beforePath="$PROJECT_DIR$/data/test_01_login.xlsx" beforeDir="false" afterPath="$PROJECT_DIR$/data/test_01_login.xlsx" afterDir="false" />  
20 <change beforePath="$PROJECT_DIR$/logs/log.log" beforeDir="false" afterPath="$PROJECT_DIR$/logs/log.log" afterDir="false" /> 6 <change beforePath="$PROJECT_DIR$/logs/log.log" beforeDir="false" afterPath="$PROJECT_DIR$/logs/log.log" afterDir="false" />
21 - <change beforePath="$PROJECT_DIR$/report/history.json" beforeDir="false" afterPath="$PROJECT_DIR$/report/history.json" afterDir="false" />  
22 - <change beforePath="$PROJECT_DIR$/report/report1.html" beforeDir="false" afterPath="$PROJECT_DIR$/report/report1.html" afterDir="false" />  
23 <change beforePath="$PROJECT_DIR$/tools/fixture.py" beforeDir="false" afterPath="$PROJECT_DIR$/tools/fixture.py" afterDir="false" /> 7 <change beforePath="$PROJECT_DIR$/tools/fixture.py" beforeDir="false" afterPath="$PROJECT_DIR$/tools/fixture.py" afterDir="false" />
24 </list> 8 </list>
25 <option name="SHOW_DIALOG" value="false" /> 9 <option name="SHOW_DIALOG" value="false" />
@@ -87,8 +71,8 @@ @@ -87,8 +71,8 @@
87 <recent name="$PROJECT_DIR$/tools" /> 71 <recent name="$PROJECT_DIR$/tools" />
88 </key> 72 </key>
89 </component> 73 </component>
90 - <component name="RunManager" selected="Python.run">  
91 - <configuration name="aaa" type="PythonConfigurationType" factoryName="Python" temporary="true" nameIsGenerated="true"> 74 + <component name="RunManager" selected="Python.fixture">
  75 + <configuration name="fixture" type="PythonConfigurationType" factoryName="Python" temporary="true" nameIsGenerated="true">
92 <module name="yxly2" /> 76 <module name="yxly2" />
93 <option name="INTERPRETER_OPTIONS" value="" /> 77 <option name="INTERPRETER_OPTIONS" value="" />
94 <option name="PARENT_ENVS" value="true" /> 78 <option name="PARENT_ENVS" value="true" />
@@ -101,7 +85,7 @@ @@ -101,7 +85,7 @@
101 <option name="ADD_CONTENT_ROOTS" value="true" /> 85 <option name="ADD_CONTENT_ROOTS" value="true" />
102 <option name="ADD_SOURCE_ROOTS" value="true" /> 86 <option name="ADD_SOURCE_ROOTS" value="true" />
103 <EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" /> 87 <EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
104 - <option name="SCRIPT_NAME" value="$PROJECT_DIR$/tools/aaa.py" /> 88 + <option name="SCRIPT_NAME" value="$PROJECT_DIR$/tools/fixture.py" />
105 <option name="PARAMETERS" value="" /> 89 <option name="PARAMETERS" value="" />
106 <option name="SHOW_COMMAND_LINE" value="false" /> 90 <option name="SHOW_COMMAND_LINE" value="false" />
107 <option name="EMULATE_TERMINAL" value="false" /> 91 <option name="EMULATE_TERMINAL" value="false" />
@@ -185,19 +169,19 @@ @@ -185,19 +169,19 @@
185 <method v="2" /> 169 <method v="2" />
186 </configuration> 170 </configuration>
187 <list> 171 <list>
188 - <item itemvalue="Python.aaa" />  
189 <item itemvalue="Python.handle_token" /> 172 <item itemvalue="Python.handle_token" />
190 <item itemvalue="Python.run" /> 173 <item itemvalue="Python.run" />
191 <item itemvalue="Python tests.Unittests in test_04_Internship_preparation.py" /> 174 <item itemvalue="Python tests.Unittests in test_04_Internship_preparation.py" />
192 <item itemvalue="Python tests.Unittests in test_06_internship_manage.py" /> 175 <item itemvalue="Python tests.Unittests in test_06_internship_manage.py" />
  176 + <item itemvalue="Python.fixture" />
193 </list> 177 </list>
194 <recent_temporary> 178 <recent_temporary>
195 <list> 179 <list>
  180 + <item itemvalue="Python.fixture" />
196 <item itemvalue="Python.run" /> 181 <item itemvalue="Python.run" />
197 <item itemvalue="Python tests.Unittests in test_06_internship_manage.py" /> 182 <item itemvalue="Python tests.Unittests in test_06_internship_manage.py" />
198 <item itemvalue="Python tests.Unittests in test_04_Internship_preparation.py" /> 183 <item itemvalue="Python tests.Unittests in test_04_Internship_preparation.py" />
199 <item itemvalue="Python.handle_token" /> 184 <item itemvalue="Python.handle_token" />
200 - <item itemvalue="Python.aaa" />  
201 </list> 185 </list>
202 </recent_temporary> 186 </recent_temporary>
203 </component> 187 </component>
@@ -286,7 +270,7 @@ @@ -286,7 +270,7 @@
286 <workItem from="1690180441280" duration="3613000" /> 270 <workItem from="1690180441280" duration="3613000" />
287 <workItem from="1690248894302" duration="5537000" /> 271 <workItem from="1690248894302" duration="5537000" />
288 <workItem from="1690335249246" duration="4289000" /> 272 <workItem from="1690335249246" duration="4289000" />
289 - <workItem from="1690422699671" duration="2972000" /> 273 + <workItem from="1690422699671" duration="5161000" />
290 </task> 274 </task>
291 <task id="LOCAL-00001" summary="1.0.0&#10;首次提交"> 275 <task id="LOCAL-00001" summary="1.0.0&#10;首次提交">
292 <created>1671544396986</created> 276 <created>1671544396986</created>
@@ -540,7 +524,21 @@ @@ -540,7 +524,21 @@
540 <option name="project" value="LOCAL" /> 524 <option name="project" value="LOCAL" />
541 <updated>1690446784585</updated> 525 <updated>1690446784585</updated>
542 </task> 526 </task>
543 - <option name="localTasksCounter" value="37" /> 527 + <task id="LOCAL-00037" summary="1.run文件改回原来版本">
  528 + <created>1690447533454</created>
  529 + <option name="number" value="00037" />
  530 + <option name="presentableId" value="LOCAL-00037" />
  531 + <option name="project" value="LOCAL" />
  532 + <updated>1690447533454</updated>
  533 + </task>
  534 + <task id="LOCAL-00038" summary="1.run文件改回原来版本">
  535 + <created>1690447562829</created>
  536 + <option name="number" value="00038" />
  537 + <option name="presentableId" value="LOCAL-00038" />
  538 + <option name="project" value="LOCAL" />
  539 + <updated>1690447562829</updated>
  540 + </task>
  541 + <option name="localTasksCounter" value="39" />
544 <servers /> 542 <servers />
545 </component> 543 </component>
546 <component name="TypeScriptGeneratedFilesManager"> 544 <component name="TypeScriptGeneratedFilesManager">
@@ -693,7 +691,7 @@ @@ -693,7 +691,7 @@
693 </line-breakpoint> 691 </line-breakpoint>
694 <line-breakpoint suspend="THREAD" type="python-line"> 692 <line-breakpoint suspend="THREAD" type="python-line">
695 <url>file://$PROJECT_DIR$/tools/fixture.py</url> 693 <url>file://$PROJECT_DIR$/tools/fixture.py</url>
696 - <line>88</line> 694 + <line>89</line>
697 <option name="timeStamp" value="60" /> 695 <option name="timeStamp" value="60" />
698 </line-breakpoint> 696 </line-breakpoint>
699 <line-breakpoint suspend="THREAD" type="python-line"> 697 <line-breakpoint suspend="THREAD" type="python-line">
@@ -960,8 +958,8 @@ @@ -960,8 +958,8 @@
960 <SUITE FILE_PATH="coverage/yxly$fixture__1_.coverage" NAME="fixture (1) Coverage Results" MODIFIED="1672814917701" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/tools" /> 958 <SUITE FILE_PATH="coverage/yxly$fixture__1_.coverage" NAME="fixture (1) Coverage Results" MODIFIED="1672814917701" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/tools" />
961 <SUITE FILE_PATH="coverage/yxly$Unittests_in_test_06_internship_manage_py.coverage" NAME="Unittests in test_06_internship_manage.py Coverage Results" MODIFIED="1678695618207" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/testcase" /> 959 <SUITE FILE_PATH="coverage/yxly$Unittests_in_test_06_internship_manage_py.coverage" NAME="Unittests in test_06_internship_manage.py Coverage Results" MODIFIED="1678695618207" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/testcase" />
962 <SUITE FILE_PATH="coverage/yxly$Unittests_in_test_05_student_practice_py.coverage" NAME="Unittests in test_05_student_practice.py Coverage Results" MODIFIED="1673431777836" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/testcase" /> 960 <SUITE FILE_PATH="coverage/yxly$Unittests_in_test_05_student_practice_py.coverage" NAME="Unittests in test_05_student_practice.py Coverage Results" MODIFIED="1673431777836" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/testcase" />
963 - <SUITE FILE_PATH="coverage/yxly$fixture.coverage" NAME="fixture Coverage Results" MODIFIED="1671628017395" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/testcase" />  
964 <SUITE FILE_PATH="coverage/yxly$handle_token.coverage" NAME="handle_token Coverage Results" MODIFIED="1687916804880" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/tools" /> 961 <SUITE FILE_PATH="coverage/yxly$handle_token.coverage" NAME="handle_token Coverage Results" MODIFIED="1687916804880" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/tools" />
  962 + <SUITE FILE_PATH="coverage/yxly$fixture.coverage" NAME="fixture Coverage Results" MODIFIED="1690450633233" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/tools" />
965 <SUITE FILE_PATH="coverage/yxly$Unittests_in_fixture_py.coverage" NAME="Unittests in fixture.py Coverage Results" MODIFIED="1671625806027" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/testcase" /> 963 <SUITE FILE_PATH="coverage/yxly$Unittests_in_fixture_py.coverage" NAME="Unittests in fixture.py Coverage Results" MODIFIED="1671625806027" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/testcase" />
966 <SUITE FILE_PATH="coverage/yxly$aaa.coverage" NAME="aaa Coverage Results" MODIFIED="1675678970517" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/tools" /> 964 <SUITE FILE_PATH="coverage/yxly$aaa.coverage" NAME="aaa Coverage Results" MODIFIED="1675678970517" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/tools" />
967 <SUITE FILE_PATH="coverage/yxly$run.coverage" NAME="run Coverage Results" MODIFIED="1690446962590" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" /> 965 <SUITE FILE_PATH="coverage/yxly$run.coverage" NAME="run Coverage Results" MODIFIED="1690446962590" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" />
@@ -3827,3 +3827,7 @@ AssertionError: '自行填报企业信息不能为空' != '项目名称已存在 @@ -3827,3 +3827,7 @@ AssertionError: '自行填报企业信息不能为空' != '项目名称已存在
3827 2023-07-27 16:38:09,362 - [test_06_internship_manage.py-->line:546] - INFO: 用例学生签到打卡成功,执行通过 3827 2023-07-27 16:38:09,362 - [test_06_internship_manage.py-->line:546] - INFO: 用例学生签到打卡成功,执行通过
3828 2023-07-27 16:38:10,879 - [test_06_internship_manage.py-->line:607] - INFO: 用例学生填写请假申请(调休)成功,执行通过 3828 2023-07-27 16:38:10,879 - [test_06_internship_manage.py-->line:607] - INFO: 用例学生填写请假申请(调休)成功,执行通过
3829 2023-07-27 16:38:12,248 - [test_06_internship_manage.py-->line:669] - INFO: 用例教师审批请假申请通过,执行通过 3829 2023-07-27 16:38:12,248 - [test_06_internship_manage.py-->line:669] - INFO: 用例教师审批请假申请通过,执行通过
  3830 +2023-07-27 17:26:18,754 - [fixture.py-->line:85] - ERROR: ---error---aaaa的值:
  3831 +2023-07-27 17:26:18,756 - [fixture.py-->line:86] - INFO: ---info---aaaa的值:
  3832 +2023-07-27 17:26:40,269 - [fixture.py-->line:85] - ERROR: ---error---aaaa的值:
  3833 +2023-07-27 17:26:40,269 - [fixture.py-->line:86] - INFO: ---info---aaaa的值:
@@ -82,10 +82,10 @@ class RandomIdentification(object): @@ -82,10 +82,10 @@ class RandomIdentification(object):
82 # aaa = radar.random_date("1980", "2022") 82 # aaa = radar.random_date("1980", "2022")
83 aaa = radar.random_date("1999", "2021") 83 aaa = radar.random_date("1999", "2021")
84 yea = aaa.year # 生成年 84 yea = aaa.year # 生成年
85 - HandleLog.log.error("---error---aaaa的值:".format(aaa))  
86 - HandleLog.log.info("---info---aaaa的值:".format(aaa))  
87 - HandleLog.log.log("---log---aaaa的值:".format(aaa))  
88 - print("---print---aaaa的值:".format(aaa)) 85 + # HandleLog.log.error("---error---aaaa的值:".format(aaa))
  86 + # HandleLog.log.info("---info---aaaa的值:".format(aaa))
  87 + # HandleLog.log.log("---log---aaaa的值:".format(aaa))
  88 + # print("---print---aaaa的值:".format(aaa))
89 89
90 # yea = random.randint(1933, int(time.strftime("%Y"))) # 生成年 90 # yea = random.randint(1933, int(time.strftime("%Y"))) # 生成年
91 # 生成月 91 # 生成月
@@ -109,7 +109,7 @@ class RandomIdentification(object): @@ -109,7 +109,7 @@ class RandomIdentification(object):
109 province = ( 109 province = (
110 '11', '12', '13', '14', '15', '21', '22', '23', '31', '32', '33', '34', '35', '36', '37', '41', '42', 110 '11', '12', '13', '14', '15', '21', '22', '23', '31', '32', '33', '34', '35', '36', '37', '41', '42',
111 '43', '44', '45', '46', '50', '51', '52', '53', '54', '61', '62', '63', '64', '65') 111 '43', '44', '45', '46', '50', '51', '52', '53', '54', '61', '62', '63', '64', '65')
112 - return str(province[random.randint(0, len(province))] + '0101') 112 + return str(province[random.randint(0, len(province) - 1)] + '0101')
113 113
114 def ran_end(self): 114 def ran_end(self):
115 # 组成前17位数字 115 # 组成前17位数字
@@ -136,6 +136,10 @@ class RandomEmail(object): @@ -136,6 +136,10 @@ class RandomEmail(object):
136 136
137 137
138 if __name__ == '__main__': 138 if __name__ == '__main__':
  139 + print("12345678")
139 print(RandomIdentification().ran()) 140 print(RandomIdentification().ran())
  141 + print("123456789012345678")
  142 + print(RandomIdentification().ran_end())
  143 +
140 # Val(Ran().ran_end()) 144 # Val(Ran().ran_end())
141 # RandomEmail.rand_email() 145 # RandomEmail.rand_email()
注册登录 后发表评论