Skip to content

C
CMS2.0_API_AUTOMATION_TEST
Commit 77aecc2e authored by 王超's avatar 王超
Browse files
Options

1.修改read_string_var.csv文件中，日期变量（aa14,aa16）预期结果;

2.修改data_check(data_recovery).yml文件，在调用相关查询接口前，先调用获取工程信息接口，初始化工程信息；
parent 2167c216
Hide whitespace changes
Inline Side-by-side
Showing with 77 additions and 53 deletions
.idea/workspace.xml
View file @ 77aecc2e
...@@ -4,15 +4,11 @@ ...@@ -4,15 +4,11 @@
<option name="autoReloadType" value="SELECTIVE" /> <option name="autoReloadType" value="SELECTIVE" />
</component> </component>
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="5f6c517d-e672-488b-afa7-3ef19e47d096" name="Changes" comment="更新"> <list default="true" id="5f6c517d-e672-488b-afa7-3ef19e47d096" name="Changes" comment="修改代码中涉及到硬编码路径位置，根据操作系统类型来进行适配">
<change beforePath="$PROJECT_DIR$/.idea/.gitignore" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/.gitignore" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/EOS_API_AUTOMATION_TEST.iml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/EOS_API_AUTOMATION_TEST.iml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/misc.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/misc.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/common/logger_util.py" beforeDir="false" afterPath="$PROJECT_DIR$/common/logger_util.py" afterDir="false" /> <change beforePath="$PROJECT_DIR$/data/VariableManagement/read_string_var.csv" beforeDir="false" afterPath="$PROJECT_DIR$/data/VariableManagement/read_string_var.csv" afterDir="false" />
<change beforePath="$PROJECT_DIR$/common/parameters_util.py" beforeDir="false" afterPath="$PROJECT_DIR$/common/parameters_util.py" afterDir="false" /> <change beforePath="$PROJECT_DIR$/testcase/1_EngineeringManagement/data_check(data_recovery).yml" beforeDir="false" afterPath="$PROJECT_DIR$/testcase/1_EngineeringManagement/data_check(data_recovery).yml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/common/requests_util.py" beforeDir="false" afterPath="$PROJECT_DIR$/common/requests_util.py" afterDir="false" /> <change beforePath="$PROJECT_DIR$/testcase/1_EngineeringManagement/test_engineering_run.py" beforeDir="false" afterPath="$PROJECT_DIR$/testcase/1_EngineeringManagement/test_engineering_run.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/common/yaml_util.py" beforeDir="false" afterPath="$PROJECT_DIR$/common/yaml_util.py" afterDir="false" />
</list> </list>
<option name="SHOW_DIALOG" value="false" /> <option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" /> <option name="HIGHLIGHT_CONFLICTS" value="true" />
...@@ -29,9 +25,9 @@ ...@@ -29,9 +25,9 @@
<component name="Git.Settings"> <component name="Git.Settings">
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" /> <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
</component> </component>
<component name="ProjectColorInfo"><![CDATA[{ <component name="ProjectColorInfo">{
"associatedIndex": 7 &quot;associatedIndex&quot;: 7
}]]></component> }</component>
<component name="ProjectId" id="2h2RckHYyLyW2EM2h97cdy5lPyG" /> <component name="ProjectId" id="2h2RckHYyLyW2EM2h97cdy5lPyG" />
<component name="ProjectLevelVcsManager"> <component name="ProjectLevelVcsManager">
<ConfirmationsSetting value="2" id="Add" /> <ConfirmationsSetting value="2" id="Add" />
...@@ -40,22 +36,22 @@ ...@@ -40,22 +36,22 @@
<option name="hideEmptyMiddlePackages" value="true" /> <option name="hideEmptyMiddlePackages" value="true" />
<option name="showLibraryContents" value="true" /> <option name="showLibraryContents" value="true" />
</component> </component>
<component name="PropertiesComponent"><![CDATA[{ <component name="PropertiesComponent">{
"keyToString": { &quot;keyToString&quot;: {
"ASKED_ADD_EXTERNAL_FILES": "true", &quot;ASKED_ADD_EXTERNAL_FILES&quot;: &quot;true&quot;,
"RunOnceActivity.OpenProjectViewOnStart": "true", &quot;RunOnceActivity.OpenProjectViewOnStart&quot;: &quot;true&quot;,
"RunOnceActivity.ShowReadmeOnStart": "true", &quot;RunOnceActivity.ShowReadmeOnStart&quot;: &quot;true&quot;,
"WebServerToolWindowFactoryState": "false", &quot;WebServerToolWindowFactoryState&quot;: &quot;false&quot;,
"git-widget-placeholder": "master", &quot;git-widget-placeholder&quot;: &quot;master&quot;,
"last_opened_file_path": "D:/CMS2.0_API/EOS_API_AUTOMATION_TEST/testcase/6_ViewManagement", &quot;last_opened_file_path&quot;: &quot;D:/CMS2.0_API/EOS_API_AUTOMATION_TEST/testcase/6_ViewManagement&quot;,
"node.js.detected.package.eslint": "true", &quot;node.js.detected.package.eslint&quot;: &quot;true&quot;,
"node.js.detected.package.tslint": "true", &quot;node.js.detected.package.tslint&quot;: &quot;true&quot;,
"node.js.selected.package.eslint": "(autodetect)", &quot;node.js.selected.package.eslint&quot;: &quot;(autodetect)&quot;,
"node.js.selected.package.tslint": "(autodetect)", &quot;node.js.selected.package.tslint&quot;: &quot;(autodetect)&quot;,
"settings.editor.selected.configurable": "com.jetbrains.python.configuration.PyActiveSdkModuleConfigurable", &quot;settings.editor.selected.configurable&quot;: &quot;com.jetbrains.python.configuration.PyActiveSdkModuleConfigurable&quot;,
"vue.rearranger.settings.migration": "true" &quot;vue.rearranger.settings.migration&quot;: &quot;true&quot;
} }
}]]></component> }</component>
<component name="RecentsManager"> <component name="RecentsManager">
<key name="CopyFile.RECENT_KEYS"> <key name="CopyFile.RECENT_KEYS">
<recent name="D:\CMS2.0_API\EOS_API_AUTOMATION_TEST\testcase\6_ViewManagement" /> <recent name="D:\CMS2.0_API\EOS_API_AUTOMATION_TEST\testcase\6_ViewManagement" />
...@@ -88,7 +84,7 @@ ...@@ -88,7 +84,7 @@
<option name="INPUT_FILE" value="" /> <option name="INPUT_FILE" value="" />
<method v="2" /> <method v="2" />
</configuration> </configuration>
<configuration name="debug_talk" type="PythonConfigurationType" factoryName="Python" temporary="true" nameIsGenerated="true"> <configuration name="testlmes" type="PythonConfigurationType" factoryName="Python" temporary="true" nameIsGenerated="true">
<module name="EOS_API_AUTOMATION_TEST" /> <module name="EOS_API_AUTOMATION_TEST" />
<option name="INTERPRETER_OPTIONS" value="" /> <option name="INTERPRETER_OPTIONS" value="" />
<option name="PARENT_ENVS" value="true" /> <option name="PARENT_ENVS" value="true" />
...@@ -96,12 +92,12 @@ ...@@ -96,12 +92,12 @@
<env name="PYTHONUNBUFFERED" value="1" /> <env name="PYTHONUNBUFFERED" value="1" />
</envs> </envs>
<option name="SDK_HOME" value="" /> <option name="SDK_HOME" value="" />
<option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" /> <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/testcase/test" />
<option name="IS_MODULE_SDK" value="true" /> <option name="IS_MODULE_SDK" value="true" />
<option name="ADD_CONTENT_ROOTS" value="true" /> <option name="ADD_CONTENT_ROOTS" value="true" />
<option name="ADD_SOURCE_ROOTS" value="true" /> <option name="ADD_SOURCE_ROOTS" value="true" />
<EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" /> <EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
<option name="SCRIPT_NAME" value="$PROJECT_DIR$/debug_talk.py" /> <option name="SCRIPT_NAME" value="$PROJECT_DIR$/testcase/test/testlmes.py" />
<option name="PARAMETERS" value="" /> <option name="PARAMETERS" value="" />
<option name="SHOW_COMMAND_LINE" value="false" /> <option name="SHOW_COMMAND_LINE" value="false" />
<option name="EMULATE_TERMINAL" value="false" /> <option name="EMULATE_TERMINAL" value="false" />
...@@ -110,7 +106,7 @@ ...@@ -110,7 +106,7 @@
<option name="INPUT_FILE" value="" /> <option name="INPUT_FILE" value="" />
<method v="2" /> <method v="2" />
</configuration> </configuration>
<configuration name="testlmes" type="PythonConfigurationType" factoryName="Python" temporary="true" nameIsGenerated="true"> <configuration name="yaml_util" type="PythonConfigurationType" factoryName="Python" temporary="true" nameIsGenerated="true">
<module name="EOS_API_AUTOMATION_TEST" /> <module name="EOS_API_AUTOMATION_TEST" />
<option name="INTERPRETER_OPTIONS" value="" /> <option name="INTERPRETER_OPTIONS" value="" />
<option name="PARENT_ENVS" value="true" /> <option name="PARENT_ENVS" value="true" />
...@@ -118,12 +114,12 @@ ...@@ -118,12 +114,12 @@
<env name="PYTHONUNBUFFERED" value="1" /> <env name="PYTHONUNBUFFERED" value="1" />
</envs> </envs>
<option name="SDK_HOME" value="" /> <option name="SDK_HOME" value="" />
<option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/testcase/test" /> <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/common" />
<option name="IS_MODULE_SDK" value="true" /> <option name="IS_MODULE_SDK" value="true" />
<option name="ADD_CONTENT_ROOTS" value="true" /> <option name="ADD_CONTENT_ROOTS" value="true" />
<option name="ADD_SOURCE_ROOTS" value="true" /> <option name="ADD_SOURCE_ROOTS" value="true" />
<EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" /> <EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
<option name="SCRIPT_NAME" value="$PROJECT_DIR$/testcase/test/testlmes.py" /> <option name="SCRIPT_NAME" value="$PROJECT_DIR$/common/yaml_util.py" />
<option name="PARAMETERS" value="" /> <option name="PARAMETERS" value="" />
<option name="SHOW_COMMAND_LINE" value="false" /> <option name="SHOW_COMMAND_LINE" value="false" />
<option name="EMULATE_TERMINAL" value="false" /> <option name="EMULATE_TERMINAL" value="false" />
...@@ -132,26 +128,21 @@ ...@@ -132,26 +128,21 @@
<option name="INPUT_FILE" value="" /> <option name="INPUT_FILE" value="" />
<method v="2" /> <method v="2" />
</configuration> </configuration>
<configuration name="yaml_util" type="PythonConfigurationType" factoryName="Python" temporary="true" nameIsGenerated="true"> <configuration name="pytest for test_engineering_run.TestCreat.test_rename_project" type="tests" factoryName="py.test" temporary="true" nameIsGenerated="true">
<module name="EOS_API_AUTOMATION_TEST" /> <module name="EOS_API_AUTOMATION_TEST" />
<option name="INTERPRETER_OPTIONS" value="" /> <option name="INTERPRETER_OPTIONS" value="" />
<option name="PARENT_ENVS" value="true" /> <option name="PARENT_ENVS" value="true" />
<envs>
<env name="PYTHONUNBUFFERED" value="1" />
</envs>
<option name="SDK_HOME" value="" /> <option name="SDK_HOME" value="" />
<option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/common" /> <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/testcase/1_EngineeringManagement" />
<option name="IS_MODULE_SDK" value="true" /> <option name="IS_MODULE_SDK" value="true" />
<option name="ADD_CONTENT_ROOTS" value="true" /> <option name="ADD_CONTENT_ROOTS" value="true" />
<option name="ADD_SOURCE_ROOTS" value="true" /> <option name="ADD_SOURCE_ROOTS" value="true" />
<EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" /> <EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
<option name="SCRIPT_NAME" value="$PROJECT_DIR$/common/yaml_util.py" /> <option name="_new_keywords" value="&quot;&quot;" />
<option name="PARAMETERS" value="" /> <option name="_new_parameters" value="&quot;&quot;" />
<option name="SHOW_COMMAND_LINE" value="false" /> <option name="_new_additionalArguments" value="&quot;&quot;" />
<option name="EMULATE_TERMINAL" value="false" /> <option name="_new_target" value="&quot;test_engineering_run.TestCreat.test_rename_project&quot;" />
<option name="MODULE_MODE" value="false" /> <option name="_new_targetType" value="&quot;PYTHON&quot;" />
<option name="REDIRECT_INPUT" value="false" />
<option name="INPUT_FILE" value="" />
<method v="2" /> <method v="2" />
</configuration> </configuration>
<configuration name="pytest in 223mode3_run.py" type="tests" factoryName="py.test" temporary="true" nameIsGenerated="true"> <configuration name="pytest in 223mode3_run.py" type="tests" factoryName="py.test" temporary="true" nameIsGenerated="true">
...@@ -174,10 +165,10 @@ ...@@ -174,10 +165,10 @@
<recent_temporary> <recent_temporary>
<list> <list>
<item itemvalue="Python.yaml_util" /> <item itemvalue="Python.yaml_util" />
<item itemvalue="Python tests.pytest for test_engineering_run.TestCreat.test_rename_project" />
<item itemvalue="Python.all_test" /> <item itemvalue="Python.all_test" />
<item itemvalue="Python.testlmes" /> <item itemvalue="Python.testlmes" />
<item itemvalue="Python tests.pytest in 223mode3_run.py" /> <item itemvalue="Python tests.pytest in 223mode3_run.py" />
<item itemvalue="Python.debug_talk" />
</list> </list>
</recent_temporary> </recent_temporary>
</component> </component>
...@@ -189,7 +180,9 @@ ...@@ -189,7 +180,9 @@
<option name="number" value="Default" /> <option name="number" value="Default" />
<option name="presentableId" value="Default" /> <option name="presentableId" value="Default" />
<updated>1716790267585</updated> <updated>1716790267585</updated>
<workItem from="1733360166391" duration="2670000" /> <workItem from="1733360166391" duration="5082000" />
<workItem from="1733371192737" duration="684000" />
<workItem from="1734596867625" duration="3972000" />
</task> </task>
<task id="LOCAL-00001" summary="更新"> <task id="LOCAL-00001" summary="更新">
<option name="closed" value="true" /> <option name="closed" value="true" />
...@@ -199,7 +192,15 @@ ...@@ -199,7 +192,15 @@
<option name="project" value="LOCAL" /> <option name="project" value="LOCAL" />
<updated>1723617388377</updated> <updated>1723617388377</updated>
</task> </task>
<option name="localTasksCounter" value="2" /> <task id="LOCAL-00002" summary="修改代码中涉及到硬编码路径位置，根据操作系统类型来进行适配">
<option name="closed" value="true" />
<created>1733363130991</created>
<option name="number" value="00002" />
<option name="presentableId" value="LOCAL-00002" />
<option name="project" value="LOCAL" />
<updated>1733363130991</updated>
</task>
<option name="localTasksCounter" value="3" />
<servers /> <servers />
</component> </component>
<component name="TypeScriptGeneratedFilesManager"> <component name="TypeScriptGeneratedFilesManager">
...@@ -219,9 +220,11 @@ ...@@ -219,9 +220,11 @@
<component name="VcsManagerConfiguration"> <component name="VcsManagerConfiguration">
<option name="ADD_EXTERNAL_FILES_SILENTLY" value="true" /> <option name="ADD_EXTERNAL_FILES_SILENTLY" value="true" />
<MESSAGE value="更新" /> <MESSAGE value="更新" />
<option name="LAST_COMMIT_MESSAGE" value="更新" /> <MESSAGE value="修改代码中涉及到硬编码路径位置，根据操作系统类型来进行适配" />
<option name="LAST_COMMIT_MESSAGE" value="修改代码中涉及到硬编码路径位置，根据操作系统类型来进行适配" />
</component> </component>
<component name="com.intellij.coverage.CoverageDataManagerImpl"> <component name="com.intellij.coverage.CoverageDataManagerImpl">
<SUITE FILE_PATH="coverage/EOS_API_AUTOMATION_TEST$yaml_util.coverage" NAME="yaml_util Coverage Results" MODIFIED="1733362011606" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/common" /> <SUITE FILE_PATH="coverage/EOS_API_AUTOMATION_TEST$yaml_util.coverage" NAME="yaml_util Coverage Results" MODIFIED="1734597299302" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/common" />
<SUITE FILE_PATH="coverage/EOS_API_AUTOMATION_TEST$pytest_for_test_engineering_run_TestCreat_test_rename_project.coverage" NAME="pytest for test_engineering_run.TestCreat.test_rename_project Coverage Results" MODIFIED="1733370985856" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/testcase/1_EngineeringManagement" />
</component> </component>
</project> </project>
\ No newline at end of file
data/VariableManagement/read_string_var.csv
View file @ 77aecc2e
...@@ -2,6 +2,6 @@ title,name,value ...@@ -2,6 +2,6 @@ title,name,value
io-字符串-A12,A12,#-~（）% io-字符串-A12,A12,#-~（）%
内部-字符串-aa12,aa12,#-~（）% 内部-字符串-aa12,aa12,#-~（）%
内部-宽字符串-aa13,aa13,#-~（）% 内部-宽字符串-aa13,aa13,#-~（）%
内部-日期-aa14,aa14,2023/10/20 内部-日期-aa14,aa14,2023-10-20
内部-时间-aa15,aa15,18:40:55 内部-时间-aa15,aa15,18:40:55
内部-日期时间-aa16,aa16,2023/10/20 18:40:55 内部-日期时间-aa16,aa16,2023-10-20 18:40:55
\ No newline at end of file \ No newline at end of file
testcase/1_EngineeringManagement/data_check(data_recovery).yml
View file @ 77aecc2e
- name: 获取工程信息 #在调用下方的查询接口前，先调用获取工程信息接口，进行工程数据的初始化
base_url: ${get_base_url(cms_url)}
request:
url: /api/v1/project/${get_extract_data(project_id)}/info
method: get
extract:
x_project: identifier
project_name: name
validate:
- equals: {status_code: 200}
- contains: id
- name: 查用户管理信息(还原后) - name: 查用户管理信息(还原后)
base_url: ${get_base_url(cms_url)} base_url: ${get_base_url(cms_url)}
request: request:
......
testcase/1_EngineeringManagement/test_engineering_run.py
View file @ 77aecc2e
import os.path
import allure import allure
import pytest import pytest
import time import time
from common.parameters_util import read_testcase_file from common.parameters_util import read_testcase_file
from common.requests_util import RequestUtil from common.requests_util import RequestUtil
from pathlib import Path
@allure.epic("CMS2.0") @allure.epic("CMS2.0")
@allure.feature("工程管理") @allure.feature("工程管理")
class TestCreat(): class TestCreat():
# 获取当前文件的Path对象
current_file = Path(__file__)
# 获取当前文件所在的目录
current_dir = current_file.parent
@allure.story("接口名称：重命名工程") @allure.story("接口名称：重命名工程")
@pytest.mark.parametrize('caseinfo', read_testcase_file('/testcase/1_EngineeringManagement/rename_project.yml')) @pytest.mark.parametrize('caseinfo', read_testcase_file('/testcase/1_EngineeringManagement/rename_project.yml'))
def test_rename_project(self, caseinfo): def test_rename_project(self, caseinfo):
...@@ -182,7 +191,6 @@ class TestCreat(): ...@@ -182,7 +191,6 @@ class TestCreat():
RequestUtil().analysis_yaml(caseinfo) RequestUtil().analysis_yaml(caseinfo)
time.sleep(2) time.sleep(2)
@allure.story("接口名称：获取鉴权码") @allure.story("接口名称：获取鉴权码")
@pytest.mark.parametrize('caseinfo',read_testcase_file('/testcase/1_EngineeringManagement/get_requesttoken.yml')) @pytest.mark.parametrize('caseinfo',read_testcase_file('/testcase/1_EngineeringManagement/get_requesttoken.yml'))
def test_get_requesttoken(self, caseinfo): def test_get_requesttoken(self, caseinfo):
......
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