From 921454c06ead0852c44bac134d4012e14146ca8a Mon Sep 17 00:00:00 2001 From: Tapani Pihlajakuja Date: Mon, 19 Jun 2023 10:46:41 +0300 Subject: [PATCH 1/2] Makes pytest case skipping in MASA pytests as intended. --- tests/test_masa_enc_dec.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/tests/test_masa_enc_dec.py b/tests/test_masa_enc_dec.py index c09da3c0d2..3f7d260d67 100644 --- a/tests/test_masa_enc_dec.py +++ b/tests/test_masa_enc_dec.py @@ -102,10 +102,12 @@ def test_masa_enc_dec( # Apply test skipping here if dtx: - if output_mode == 'EXT' and ivas_br in test_split_br: - pytest.skip("Skipping some DTX bitrates for EXT") + if output_mode == 'EXT': + if ivas_br in test_split_br: + pytest.skip("Skipping some DTX bitrates for EXT") else: - pytest.skip("Skipping some other DTX bitrates for other outputs") + if ivas_br not in test_split_br: + pytest.skip("Skipping some other DTX bitrates for other outputs") # Set reference encoder and decoder ref_encoder_frontend = EncoderFrontend(ref_encoder_path, "REF") -- GitLab From 012f7fd9dc3fc91e5a713d5955888951020864a7 Mon Sep 17 00:00:00 2001 From: Tapani Pihlajakuja Date: Mon, 19 Jun 2023 11:52:54 +0300 Subject: [PATCH 2/2] Include EXT + DTX in MASA pytest for all bitrates --- tests/test_masa_enc_dec.py | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/tests/test_masa_enc_dec.py b/tests/test_masa_enc_dec.py index 3f7d260d67..bfa24c6d30 100644 --- a/tests/test_masa_enc_dec.py +++ b/tests/test_masa_enc_dec.py @@ -102,12 +102,9 @@ def test_masa_enc_dec( # Apply test skipping here if dtx: - if output_mode == 'EXT': - if ivas_br in test_split_br: - pytest.skip("Skipping some DTX bitrates for EXT") - else: + if output_mode != 'EXT': if ivas_br not in test_split_br: - pytest.skip("Skipping some other DTX bitrates for other outputs") + pytest.skip("Skipping some DTX bitrates for other than EXT output to save time") # Set reference encoder and decoder ref_encoder_frontend = EncoderFrontend(ref_encoder_path, "REF") -- GitLab