Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
I
InterfaceAutoTest
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
TestAuto
InterfaceAutoTest
Commits
0d943153
Commit
0d943153
authored
May 11, 2021
by
taoke
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
header获取获取空,或不是非 json字符串,存为None
parent
51b0a598
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
12 additions
and
5 deletions
+12
-5
common/tools.py
+2
-0
common/utils/getExcelData.py
+1
-0
config.py
+3
-2
test_case/bmy/conftest.py
+2
-1
test_case/bmy/test_riskMonitar.py
+4
-2
test_case_data/bmy/bmy_case.xlsx
+0
-0
No files found.
common/tools.py
View file @
0d943153
...
...
@@ -32,6 +32,7 @@ def request_main(url, headers, method, data):
if
headers
==
None
or
headers
==
{}
or
headers
==
""
:
# 如果传的headers为空,使用各自产品的通用headers
headers
=
get_headers
()
print
(
"内部我打印一下headers"
,
headers
)
try
:
res
=
request_by_method
(
method
,
headers
)
except
requests
.
exceptions
.
ConnectionError
as
e
:
...
...
@@ -50,6 +51,7 @@ def get_headers():
headers
=
BMCConfig
.
headers
elif
name
==
BmyConfig
.
name
:
headers
=
BmyConfig
.
headers
return
headers
elif
name
==
SSOConfig
.
name
:
headers
=
SSOConfig
.
headers
return
headers
...
...
common/utils/getExcelData.py
View file @
0d943153
...
...
@@ -35,6 +35,7 @@ def get_excelData(workBook,sheetName,caseName):
dict0
[
'headers'
]
=
json
.
loads
(
dict0
[
'headers'
])
except
:
print
(
'header无'
)
dict0
[
'headers'
]
=
None
lis
.
append
(
dict0
)
idx
+=
1
return
lis
...
...
config.py
View file @
0d943153
...
...
@@ -9,7 +9,7 @@ class BaseConfig():
current_name
=
"auto"
test_case_dir
=
"test_case/"
secs
=
0.1
# 测试用例间隔运行时间
secs
=
0.1
# 测试用例间隔运行时间
test_redis
=
{
"host"
:
"10.197.236.197"
,
"port"
:
6379
,
"password"
:
"123456"
}
root_path
=
os
.
path
.
abspath
(
os
.
path
.
dirname
(
__file__
))
# 项目根目录
...
...
@@ -66,7 +66,8 @@ class BmyConfig(BaseConfig):
test_name_password
=
{
"username"
:
"15151500000"
,
"password"
:
"bmy123456"
}
# 企业云接口的Authorization
bmy_token
=
''
header
=
{
"Content-Type"
:
"application/json"
}
# header = {"Authorization":bmy_token,"Content-Type":"application/json"}
header
=
''
class
SSOConfig
(
BaseConfig
):
...
...
test_case/bmy/conftest.py
View file @
0d943153
...
...
@@ -10,4 +10,5 @@ import pytest
def
bmy_login
():
"""BMY登录获取token"""
res
=
BMY
()
.
bmy_login
(
BmyConfig
.
test_name_password
)
setattr
(
BmyConfig
,
'bmy_token'
,
res
)
header
=
{
"Authorization"
:
res
,
"Content-Type"
:
"application/json"
}
setattr
(
BmyConfig
,
'header'
,
header
)
test_case/bmy/test_riskMonitar.py
View file @
0d943153
...
...
@@ -27,11 +27,13 @@ class TestLogin():
expectData
=
inData
[
'expectData'
]
headers
=
inData
[
'headers'
]
"""处理"""
headers
[
'Authorization'
]
=
BmyConfig
.
bmy_token
#
"""处理"""
#
headers['Authorization'] = BmyConfig.bmy_token
"""请求"""
res
=
request_main
(
url
,
headers
,
method
,
req_data
)
print
(
"我打印一下headers"
,
headers
)
"""断言"""
assert
res
[
'code'
]
==
expectData
[
'code'
]
...
...
test_case_data/bmy/bmy_case.xlsx
View file @
0d943153
No preview for this file type
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment