diff --git a/ga4gh/testbed/submit/report_submitter.py b/ga4gh/testbed/submit/report_submitter.py index 52b1bdf..f8d68ae 100644 --- a/ga4gh/testbed/submit/report_submitter.py +++ b/ga4gh/testbed/submit/report_submitter.py @@ -16,18 +16,21 @@ def submit_report(series_id, series_token, report:Report, url="http://localhost: report - GA4GH report object url - URL of the testbed server ''' + results = { + "status_code": None, + "error_message": None, + "report_id": None + } if type(report) != Report: - raise Exception() + results["status_code"] = 400 + results["error_message"] = "Report submitted is not a GA4GH Report object" + return results header = {"GA4GH-TestbedReportSeriesId": series_id, "GA4GH-TestbedReportSeriesToken": series_token} submit_request = requests.post(url, headers=header ,json=json.loads(report.to_json())) - results = { - "status_code": submit_request.status_code, - "error_message": None, - "report_id": None - } + results["status_code"] = submit_request.status_code if submit_request.status_code == 200: results["report_id"] = submit_request.json()["id"] diff --git a/tests/test_unit/test_ga4gh/test_testbed/test_submit/test_report_submitter.py b/tests/test_unit/test_ga4gh/test_testbed/test_submit/test_report_submitter.py index 8db552a..1a6dccc 100644 --- a/tests/test_unit/test_ga4gh/test_testbed/test_submit/test_report_submitter.py +++ b/tests/test_unit/test_ga4gh/test_testbed/test_submit/test_report_submitter.py @@ -20,20 +20,20 @@ "http://localhost:4500/reports", 200 ), - #( - # "1edb5213-52a2-434f-a7b8-b101fea8fb30", - # "K5pLbwScVu8rEoLLj8pRy5Wv7EXTVahn", - # "", - # "http://localhost:4500/reports", - # 400 - #), - #( - # "1edb5213-52a2-434f-a7b8-b101fea8fb30", - # "K5pLbwScVu8rEoLLj8pRy5Wv7EXTVahn", - # {}, - # "http://localhost:4500/reports", - # 500 - #), + ( + "1edb5213-52a2-434f-a7b8-b101fea8fb30", + "K5pLbwScVu8rEoLLj8pRy5Wv7EXTVahn", + "", + "http://localhost:4500/reports", + 400 + ), + ( + "1edb5213-52a2-434f-a7b8-b101fea8fb30", + "K5pLbwScVu8rEoLLj8pRy5Wv7EXTVahn", + {}, + "http://localhost:4500/reports", + 400 + ), ( "", "K5pLbwScVu8rEoLLj8pRy5Wv7EXTVahn",