Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
G
gracedb-client
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Locked Files
Issues
4
Issues
4
List
Boards
Labels
Service Desk
Milestones
Iterations
Merge Requests
3
Merge Requests
3
Requirements
Requirements
List
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Test Cases
Security & Compliance
Security & Compliance
Dependency List
License Compliance
Operations
Operations
Incidents
Environments
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
CI / CD
Code Review
Insights
Issue
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
lscsoft
gracedb-client
Commits
2ea691b8
Commit
2ea691b8
authored
Oct 15, 2019
by
Alexander Pace
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
update client tests
parent
d7172df2
Pipeline
#84051
failed with stages
in 4 minutes and 51 seconds
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
26 additions
and
8 deletions
+26
-8
ligo/gracedb/rest.py
ligo/gracedb/rest.py
+16
-4
ligo/gracedb/test/test_events.py
ligo/gracedb/test/test_events.py
+5
-2
ligo/gracedb/test/test_superevents.py
ligo/gracedb/test/test_superevents.py
+5
-2
No files found.
ligo/gracedb/rest.py
View file @
2ea691b8
...
...
@@ -1262,7 +1262,8 @@ class GraceDb(GsiRest):
return
self
.
post
(
uri
,
body
=
request_body
)
def
updateSuperevent
(
self
,
superevent_id
,
t_start
=
None
,
t_0
=
None
,
t_end
=
None
,
preferred_event
=
None
):
t_end
=
None
,
preferred_event
=
None
,
em_type
=
None
,
coinc_far
=
None
):
"""Update a superevent's parameters.
The same permission restrictions apply as for
...
...
@@ -1283,6 +1284,12 @@ class GraceDb(GsiRest):
superevent (``'production'``, ``'test'``, ``'mdc'``) and must
either already be a part of this superevent, or not be in a
superevent at all.
em_type (:obj:`str`, optional): name of coincident EM search
for "preferred" EM coincident event. Defined by analyst or
pipeline (e.g., RAVEN). Default is null for new superevents.
coinc_far (:obj:`float`, optional): new value for coincident FAR
with preferred EM coincident event. Defined by analyst or
pipeline (e.g., RAVEN). Default is null for new superevents.
Returns:
:class:`httplib.HTTPResponse`
...
...
@@ -1299,9 +1306,10 @@ class GraceDb(GsiRest):
200
"""
# noqa: W605
# Make sure that at least one parameter is provided
if
not
(
t_start
or
t_0
or
t_end
or
preferred_event
):
raise
ValueError
(
'Provide at least one of t_start, t_0, t_end, or '
'preferred_event'
)
if
not
(
t_start
or
t_0
or
t_end
or
preferred_event
or
em_type
or
coinc_far
):
raise
ValueError
(
'Provide at least one of t_start, t_0, t_end, '
'preferred_event, em_type, or coinc_far'
)
request_body
=
{}
if
t_start
is
not
None
:
...
...
@@ -1312,6 +1320,10 @@ class GraceDb(GsiRest):
request_body
[
't_end'
]
=
t_end
if
preferred_event
is
not
None
:
request_body
[
'preferred_event'
]
=
preferred_event
if
em_type
is
not
None
:
request_body
[
'em_type'
]
=
em_type
if
coinc_far
is
not
None
:
request_body
[
'coinc_far'
]
=
coinc_far
template
=
self
.
templates
[
'superevent-detail-template'
]
uri
=
template
.
format
(
superevent_id
=
superevent_id
)
return
self
.
patch
(
uri
,
body
=
request_body
)
...
...
ligo/gracedb/test/test_events.py
View file @
2ea691b8
...
...
@@ -329,7 +329,7 @@ def test_creation_args(
def
test_update_no_args
(
safe_client
):
err_msg
=
'Provide at least one of t_start, t_0, t_end,
or preferred_event
'
err_msg
=
'Provide at least one of t_start, t_0, t_end,
preferred_event, em_type, or coinc_far
'
with
pytest
.
raises
(
ValueError
,
match
=
err_msg
):
safe_client
.
updateSuperevent
(
'S181224a'
)
...
...
@@ -341,7 +341,10 @@ def test_update_no_args(safe_client):
{
't_0'
:
2
},
{
't_end'
:
3
},
{
'preferred_event'
:
'G0001'
},
{
't_start'
:
1
,
't_0'
:
2
,
't_end'
:
3
,
'preferred_event'
:
'G0001'
},
{
'em_type'
:
'EM_TEST'
},
{
'coinc_far'
:
'4'
},
{
't_start'
:
1
,
't_0'
:
2
,
't_end'
:
3
,
'preferred_event'
:
'G0001'
,
'em_type'
:
'EM_TEST'
,
'coinc_far'
:
'4'
},
]
)
def
test_update_args
(
safe_client
,
update_kwargs
):
...
...
ligo/gracedb/test/test_superevents.py
View file @
2ea691b8
...
...
@@ -119,7 +119,7 @@ def test_creation_args(
def
test_update_no_args
(
safe_client
):
err_msg
=
'Provide at least one of t_start, t_0, t_end,
or preferred_event
'
err_msg
=
'Provide at least one of t_start, t_0, t_end,
preferred_event, em_type, or coinc_far
'
with
pytest
.
raises
(
ValueError
,
match
=
err_msg
):
safe_client
.
updateSuperevent
(
'S181224a'
)
...
...
@@ -131,7 +131,10 @@ def test_update_no_args(safe_client):
{
't_0'
:
2
},
{
't_end'
:
3
},
{
'preferred_event'
:
'G0001'
},
{
't_start'
:
1
,
't_0'
:
2
,
't_end'
:
3
,
'preferred_event'
:
'G0001'
},
{
'em_type'
:
'EM_TEST'
},
{
'coinc_far'
:
'4'
},
{
't_start'
:
1
,
't_0'
:
2
,
't_end'
:
3
,
'preferred_event'
:
'G0001'
,
'em_type'
:
'EM_TEST'
,
'coinc_far'
:
'4'
},
]
)
def
test_update_args
(
safe_client
,
update_kwargs
):
...
...
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