Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
W
willdesk_apiauto
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
29
Issues
29
List
Boards
Labels
Service Desk
Milestones
Merge Requests
29
Merge Requests
29
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Incidents
Environments
Packages & Registries
Packages & Registries
Package Registry
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
桦生 詹
willdesk_apiauto
Commits
16159520
Commit
16159520
authored
Mar 07, 2024
by
zhanhuasheng
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
新增关闭数据库链接、异步任务
parent
a5d7c0ac
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
13 additions
and
2 deletions
+13
-2
conftest.py
conftest.py
+13
-2
No files found.
conftest.py
View file @
16159520
import
asyncio
from
Utils.sql_handler
import
test_env_conn
import
pytest
import
pytest
import
requests
import
requests
import
time
import
time
...
@@ -88,6 +90,7 @@ def customer_login():
...
@@ -88,6 +90,7 @@ def customer_login():
login_res
=
session
.
post
(
url
=
login_url
,
json
=
data
,
headers
=
headers
).
json
()
login_res
=
session
.
post
(
url
=
login_url
,
json
=
data
,
headers
=
headers
).
json
()
setattr
(
global_variate
.
Global
,
'clientToken'
,
login_res
[
'data'
][
'accessToken'
])
setattr
(
global_variate
.
Global
,
'clientToken'
,
login_res
[
'data'
][
'accessToken'
])
setattr
(
global_variate
.
Global
,
'customerId'
,
login_res
[
'data'
][
'customerId'
])
setattr
(
global_variate
.
Global
,
'customerId'
,
login_res
[
'data'
][
'customerId'
])
setattr
(
global_variate
.
Global
,
'customerName'
,
login_res
[
'data'
][
'name'
])
address
=
'wss://atestws.sealapps.com/ws'
if
env
==
'test'
else
'wss://ws.willdesk.com/ws'
address
=
'wss://atestws.sealapps.com/ws'
if
env
==
'test'
else
'wss://ws.willdesk.com/ws'
print
(
f
'
{
address
}
?platform=1&authorization=
{
global_variate
.
Global
.
access_token
}
&t=
{
int
(
time
.
time
())
}
'
)
print
(
f
'
{
address
}
?platform=1&authorization=
{
global_variate
.
Global
.
access_token
}
&t=
{
int
(
time
.
time
())
}
'
)
...
@@ -98,9 +101,17 @@ def customer_login():
...
@@ -98,9 +101,17 @@ def customer_login():
url
=
f
'
{
address
}
?platform=1&authorization=
{
global_variate
.
Global
.
clientToken
}
&t=
{
int
(
time
.
time
())
}
'
,
url
=
f
'
{
address
}
?platform=1&authorization=
{
global_variate
.
Global
.
clientToken
}
&t=
{
int
(
time
.
time
())
}
'
,
attr
=
'customer'
)
# c端websocket链接
attr
=
'customer'
)
# c端websocket链接
async
def
close_ws
():
await
asyncio
.
gather
(
asyncio
.
create_task
(
websocket_handler
.
ws_willdesk
.
close
()),
asyncio
.
create_task
(
websocket_handler
.
ws_client
.
close
()))
@
pytest
.
fixture
(
scope
=
'session'
,
autouse
=
True
)
@
pytest
.
fixture
(
scope
=
'session'
,
autouse
=
True
)
def
call_fixture
():
def
call_fixture
():
#自定义调用顺序
#自定义调用顺序
willdesk_login
()
willdesk_login
()
customer_login
()
customer_login
()
yield
test_env_conn
.
close_db
()
loop
=
websocket_handler
.
loop
loop
.
run_until_complete
(
close_ws
())
loop
.
stop
()
loop
.
close
()
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