Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Split long strings in stream hls tests #135271

Merged
merged 2 commits into from
Jan 10, 2025
Merged

Split long strings in stream hls tests #135271

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
254623c
Split long strings in stream hls tests
epenet Jan 10, 2025
da8e9fb
Restore comma
epenet Jan 10, 2025
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
9 changes: 6 additions & 3 deletions tests/components/stream/test_hls.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,13 +119,16 @@ def make_playlist(
response.extend(
[
f"#EXT-X-PART-INF:PART-TARGET={part_target_duration:.3f}",
f"#EXT-X-SERVER-CONTROL:CAN-BLOCK-RELOAD=YES,PART-HOLD-BACK={2*part_target_duration:.3f}",
f"#EXT-X-START:TIME-OFFSET=-{EXT_X_START_LL_HLS*part_target_duration:.3f},PRECISE=YES",
"#EXT-X-SERVER-CONTROL:CAN-BLOCK-RELOAD=YES,PART-HOLD-BACK="
f"{2 * part_target_duration:.3f}",
"#EXT-X-START:TIME-OFFSET=-"
f"{EXT_X_START_LL_HLS * part_target_duration:.3f},PRECISE=YES",
]
)
else:
response.append(
f"#EXT-X-START:TIME-OFFSET=-{EXT_X_START_NON_LL_HLS*segment_duration:.3f},PRECISE=YES",
"#EXT-X-START:TIME-OFFSET=-"
f"{EXT_X_START_NON_LL_HLS * segment_duration:.3f},PRECISE=YES",
)
if segments:
response.extend(segments)
Expand Down
26 changes: 13 additions & 13 deletions tests/components/stream/test_ll_hls.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,18 +99,17 @@ def make_segment_with_parts(
if discontinuity:
response.append("#EXT-X-DISCONTINUITY")
response.extend(
f'#EXT-X-PART:DURATION={TEST_PART_DURATION:.3f},URI="./segment/{segment}.{i}.m4s"{",INDEPENDENT=YES" if i%independent_period==0 else ""}'
f'#EXT-X-PART:DURATION={TEST_PART_DURATION:.3f},'
f'URI="./segment/{segment}.{i}.m4s"'
f'{",INDEPENDENT=YES" if i % independent_period == 0 else ""}'
for i in range(num_parts)
)
response.extend(
[
"#EXT-X-PROGRAM-DATE-TIME:"
+ FAKE_TIME.strftime("%Y-%m-%dT%H:%M:%S.%f")[:-3]
+ "Z",
f"#EXTINF:{math.ceil(SEGMENT_DURATION/TEST_PART_DURATION)*TEST_PART_DURATION:.3f},",
f"./segment/{segment}.m4s",
]
response.append(
f"#EXT-X-PROGRAM-DATE-TIME:{FAKE_TIME.strftime('%Y-%m-%dT%H:%M:%S.%f')[:-3]}Z"
)
duration = math.ceil(SEGMENT_DURATION / TEST_PART_DURATION) * TEST_PART_DURATION
response.append(f"#EXTINF:{duration:.3f},")
response.append(f"./segment/{segment}.m4s")
return "\n".join(response)


Expand Down Expand Up @@ -166,7 +165,7 @@ async def test_ll_hls_stream(
# Fetch playlist
playlist_url = "/" + master_playlist.splitlines()[-1]
playlist_response = await hls_client.get(
playlist_url + f"?_HLS_msn={num_playlist_segments-1}"
playlist_url + f"?_HLS_msn={num_playlist_segments - 1}"
)
assert playlist_response.status == HTTPStatus.OK

Expand Down Expand Up @@ -465,7 +464,8 @@ async def _handler_bad_request(request):
).status == HTTPStatus.BAD_REQUEST
assert (
await hls_client.get(
f"/playlist.m3u8?_HLS_msn=1&_HLS_part={num_completed_parts-1+hass.data[DOMAIN][ATTR_SETTINGS].hls_advance_part_limit}"
"/playlist.m3u8?_HLS_msn=1&_HLS_part="
f"{num_completed_parts - 1 + hass.data[DOMAIN][ATTR_SETTINGS].hls_advance_part_limit}"
)
).status == HTTPStatus.BAD_REQUEST
stream_worker_sync.resume()
Expand Down Expand Up @@ -515,13 +515,13 @@ async def test_ll_hls_playlist_rollover_part(
*(
[
hls_client.get(
f"/playlist.m3u8?_HLS_msn=1&_HLS_part={len(segment.parts)-1}"
f"/playlist.m3u8?_HLS_msn=1&_HLS_part={len(segment.parts) - 1}"
),
hls_client.get(
f"/playlist.m3u8?_HLS_msn=1&_HLS_part={len(segment.parts)}"
),
hls_client.get(
f"/playlist.m3u8?_HLS_msn=1&_HLS_part={len(segment.parts)+1}"
f"/playlist.m3u8?_HLS_msn=1&_HLS_part={len(segment.parts) + 1}"
),
hls_client.get("/playlist.m3u8?_HLS_msn=2&_HLS_part=0"),
]
Expand Down
Loading