Skip to content
This repository was archived by the owner on Nov 17, 2022. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion elemental/client.py
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@ def describe_event(self, event_id: str, timeout: Optional[int] = None) -> EventS
event_info = {}

destinations = list(ET.fromstring(response.text).iter('destination'))
uri = destinations[0].find('uri')
uri = destinations[0].find('uri') if destinations else None
event_info['origin_url'] = uri.text if uri is not None else ''
if len(destinations) > 1:
uri = destinations[1].find('uri')
Expand Down
17 changes: 16 additions & 1 deletion tests/client_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -443,7 +443,7 @@ def test_get_preview_will_parse_response_json_as_expect():
f'images/thumbs/p_1563568669_job_0.jpg'}


def test_get_preview_will_raise_ElementalException_if_preview_unavaliable():
def test_get_preview_will_raise_ElementalException_if_preview_unavailable():
client = ElementalLive(ELEMENTAL_ADDRESS, USER, API_KEY)

client.generate_headers = mock.Mock()
Expand Down Expand Up @@ -505,6 +505,21 @@ def test_describe_event_will_return_event_info_as_expect():
'status': 'complete'}


def test_describe_event_will_return_event_info_with_empty_origin_url_if_destination_is_missing_in_response():
client = ElementalLive(ELEMENTAL_ADDRESS, USER, API_KEY)
client.generate_headers = mock.Mock()
client.generate_headers.return_value = {'Accept': 'application/xml', 'Content-Type': 'application/xml'}
client.send_request = mock.Mock()
client.send_request.return_value = mock_response(
status=200, text='<live_event></live_event>')

event_id = '139'
event_info = client.describe_event(event_id)
assert event_info == {'origin_url': '',
'backup_url': None,
'status': 'unknown'}


def test_get_event_status():
client = ElementalLive(ELEMENTAL_ADDRESS, USER, API_KEY)

Expand Down