From bda75d2ee18c38d7b1c5f08e1eee91851e0fc7b0 Mon Sep 17 00:00:00 2001 From: voluntas Date: Wed, 31 Jul 2024 18:07:55 +0900 Subject: [PATCH] =?UTF-8?q?mimeType=20=E9=96=93=E9=81=95=E3=81=A3=E3=81=A6?= =?UTF-8?q?=E3=81=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/e2e-test.yml | 3 ++- tests/test_macos.py | 8 ++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.github/workflows/e2e-test.yml b/.github/workflows/e2e-test.yml index a6df7677..4c5f8bd6 100644 --- a/.github/workflows/e2e-test.yml +++ b/.github/workflows/e2e-test.yml @@ -68,13 +68,14 @@ jobs: - run: rye sync - run: rye run python run.py macos_arm64 # - run: rye test + # macOS のテストを先にする + - run: rye run pytest tests/test_macos.py -s - run: rye run pytest tests/test_sendonly_recvonly.py -s - run: rye run pytest tests/test_messaging.py -s - run: rye run pytest tests/test_openh264.py -s - run: rye run pytest tests/test_stats.py -s - run: rye run pytest tests/test_switched.py -s - run: rye run pytest tests/test_vad.py -s - - run: rye run pytest tests/test_macos.py -s # TODO: e2e_windows_test を追加する diff --git a/tests/test_macos.py b/tests/test_macos.py index aeb57326..d97bdf70 100644 --- a/tests/test_macos.py +++ b/tests/test_macos.py @@ -106,7 +106,7 @@ def test_macos_h264_sendonly_recvonly(setup): # codec が無かったら StopIteration 例外が上がる sendonly_codec_stats = next(s for s in sendonly_stats if s.get("type") == "codec") # H.264 が採用されているかどうか確認する - assert sendonly_codec_stats["mimeType"] == "video/AV1" + assert sendonly_codec_stats["mimeType"] == "video/H264" # outbound-rtp が無かったら StopIteration 例外が上がる outbound_rtp_stats = next(s for s in sendonly_stats if s.get("type") == "outbound-rtp") @@ -117,7 +117,7 @@ def test_macos_h264_sendonly_recvonly(setup): # codec が無かったら StopIteration 例外が上がる recvonly_codec_stats = next(s for s in recvonly_stats if s.get("type") == "codec") # H.264 が採用されているかどうか確認する - assert recvonly_codec_stats["mimeType"] == "video/AV1" + assert recvonly_codec_stats["mimeType"] == "video/H264" # outbound-rtp が無かったら StopIteration 例外が上がる inbound_rtp_stats = next(s for s in recvonly_stats if s.get("type") == "inbound-rtp") @@ -159,7 +159,7 @@ def test_macos_h265_sendonly_recvonly(setup): # codec が無かったら StopIteration 例外が上がる sendonly_codec_stats = next(s for s in sendonly_stats if s.get("type") == "codec") # H.264 が採用されているかどうか確認する - assert sendonly_codec_stats["mimeType"] == "video/AV1" + assert sendonly_codec_stats["mimeType"] == "video/H265" # outbound-rtp が無かったら StopIteration 例外が上がる outbound_rtp_stats = next(s for s in sendonly_stats if s.get("type") == "outbound-rtp") @@ -170,7 +170,7 @@ def test_macos_h265_sendonly_recvonly(setup): # codec が無かったら StopIteration 例外が上がる recvonly_codec_stats = next(s for s in recvonly_stats if s.get("type") == "codec") # H.264 が採用されているかどうか確認する - assert recvonly_codec_stats["mimeType"] == "video/AV1" + assert recvonly_codec_stats["mimeType"] == "video/H265" # outbound-rtp が無かったら StopIteration 例外が上がる inbound_rtp_stats = next(s for s in recvonly_stats if s.get("type") == "inbound-rtp")