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
38720b8c
Commit
38720b8c
authored
May 10, 2021
by
fanxun
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/master'
parents
b56995e7
1d2a5739
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 additions
and
9 deletions
+1
-9
common/tools.py
+1
-9
No files found.
common/tools.py
View file @
38720b8c
...
@@ -26,7 +26,7 @@ def request_main(url, headers, method, data):
...
@@ -26,7 +26,7 @@ def request_main(url, headers, method, data):
inner_res
=
requests
.
post
(
url
=
url
,
headers
=
headers
,
data
=
data
)
inner_res
=
requests
.
post
(
url
=
url
,
headers
=
headers
,
data
=
data
)
return
inner_res
return
inner_res
except
Exception
as
e
:
except
Exception
as
e
:
logging
.
log
(
str
(
e
))
#
logging.log(str(e))
raise
Exception
raise
Exception
if
headers
==
None
or
headers
==
{}
or
headers
==
""
:
if
headers
==
None
or
headers
==
{}
or
headers
==
""
:
...
@@ -38,14 +38,6 @@ def request_main(url, headers, method, data):
...
@@ -38,14 +38,6 @@ def request_main(url, headers, method, data):
logging
.
log
(
str
(
e
))
logging
.
log
(
str
(
e
))
except
requests
.
exceptions
.
RequestException
as
e
:
except
requests
.
exceptions
.
RequestException
as
e
:
logging
.
log
(
str
(
e
))
logging
.
log
(
str
(
e
))
if
"mimeType"
in
headers
.
keys
():
headers
[
'mimeType'
]
=
"application/x-www-form-urlencoded"
else
:
headers
[
'Content-Type'
]
=
"application/x-www-form-urlencoded"
try
:
res
=
request_by_method
(
method
,
headers
)
except
requests
.
exceptions
.
RequestException
as
e
:
logging
.
log
(
str
(
e
))
if
res
!=
None
:
if
res
!=
None
:
return
res
.
json
()
return
res
.
json
()
return
res
return
res
...
...
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