Skip to content

Commit

Permalink
Revert "workflows: don't remove references at the end"
Browse files Browse the repository at this point in the history
This reverts commit e4043b3.
We are getting duplicated references and failing validation after,
will investigate.
  • Loading branch information
david-caro committed Feb 20, 2018
1 parent 9ccc342 commit e8996e5
Show file tree
Hide file tree
Showing 3 changed files with 57 additions and 0 deletions.
7 changes: 7 additions & 0 deletions inspirehep/modules/workflows/tasks/submission.py
Original file line number Diff line number Diff line change
Expand Up @@ -306,3 +306,10 @@ def prepare_keywords(obj, eng):
obj.data['keywords'] = keywords

obj.log.debug('Finally got keywords: \n%s', pformat(keywords))


@with_debug_logging
def remove_references(obj, eng):
obj.log.info(obj.data)
if 'references' in obj.data:
del obj.data['references']
2 changes: 2 additions & 0 deletions inspirehep/modules/workflows/workflows/article.py
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,7 @@
create_ticket,
filter_keywords,
prepare_keywords,
remove_references,
reply_ticket,
send_robotupload,
wait_webcoll,
Expand Down Expand Up @@ -217,6 +218,7 @@
add_core,
filter_keywords,
prepare_keywords,
remove_references,
set_refereed_and_fix_document_type,
fix_submission_number,
]
Expand Down
48 changes: 48 additions & 0 deletions tests/unit/workflows/test_workflows_tasks_submission.py
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
create_ticket,
filter_keywords,
prepare_keywords,
remove_references,
reply_ticket,
send_robotupload,
wait_webcoll,
Expand Down Expand Up @@ -625,3 +626,50 @@ def test_prepare_keywords_does_nothing_if_no_keywords_were_predicted():

assert validate(result['keywords'], subschema) is None
assert expected == result['keywords']


def test_remove_references():
schema = load_schema('hep')
subschema = schema['properties']['references']

data = {
'references': [
{
'reference': {
'arxiv_eprint': 'hep-th/9710014',
'authors': [
{'full_name': 'Maldacena, J.'},
{'full_name': 'Strominger, A.'},
],
'label': '1',
},
},
],
}
extra_data = {}
assert validate(data['references'], subschema) is None

obj = MockObj(data, extra_data)
eng = MockEng()

assert remove_references(obj, eng) is None

expected = {}
result = obj.data

assert expected == result


def test_remove_references_does_nothing_when_there_are_no_references():
data = {}
extra_data = {}

obj = MockObj(data, extra_data)
eng = MockEng()

assert remove_references(obj, eng) is None

expected = {}
result = obj.data

assert expected == result

0 comments on commit e8996e5

Please sign in to comment.