Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
File Transfer Service
fts-rest
Commits
8b402084
Commit
8b402084
authored
Feb 14, 2017
by
Maria Arsuaga Rios
Browse files
FTS:893 Update reuse tests
parent
66db909c
Pipeline
#83037
passed with stage
in 13 seconds
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
src/fts3rest/fts3rest/tests/functional/test_job_cancel.py
View file @
8b402084
...
...
@@ -415,7 +415,12 @@ class TestJobCancel(TestController):
# Is it in the database?
job
=
Session
.
query
(
Job
).
get
(
job_id
)
self
.
assertEqual
(
job
.
job_state
,
'CANCELED'
)
self
.
assertEqual
(
job
.
job_type
,
'Y'
)
auto_session_reuse
=
pylons
.
config
[
'fts3.AutoSessionReuse'
]
if
auto_session_reuse
==
'true'
:
self
.
assertEqual
(
job
.
job_type
,
'Y'
)
else
:
self
.
assertEqual
(
job
.
job_type
,
'N'
)
self
.
assertNotEqual
(
None
,
job
.
job_finished
)
for
f
in
job
.
files
:
...
...
src/fts3rest/fts3rest/tests/functional/test_multiple.py
View file @
8b402084
...
...
@@ -20,7 +20,7 @@ import json
from
fts3rest.tests
import
TestController
from
fts3rest.lib.base
import
Session
from
fts3.model
import
Job
,
File
import
pylons
class
TestMultiple
(
TestController
):
"""
...
...
@@ -416,8 +416,12 @@ class TestMultiple(TestController):
).
json
[
'job_id'
]
job
=
Session
.
query
(
Job
).
get
(
job_id
)
self
.
assertEqual
(
job
.
job_type
,
'Y'
)
auto_session_reuse
=
pylons
.
config
[
'fts3.AutoSessionReuse'
]
if
auto_session_reuse
==
'true'
:
self
.
assertEqual
(
job
.
job_type
,
'Y'
)
else
:
self
.
assertEqual
(
job
.
job_type
,
'N'
)
files
=
Session
.
query
(
File
).
filter
(
File
.
job_id
==
job_id
)
hashed
=
files
[
0
].
hashed_id
for
f
in
files
:
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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