Commit 23f6f2ea authored by norvell's avatar norvell
Browse files

Unify setting of properties in xml report

parent f739854c

tests/cmp_pcm.py

+1 −5
Original line number Diff line number Diff line
@@ -44,11 +44,7 @@ def cmp_pcm(file1, file2, out_config, fs, get_mld=False, mld_lim=0, abs_tol=0) - 
            f"file size in samples: file 1 = {s1.shape[0]},",

            f"file 2 = {s2.shape[0]}",

        )

        reason = "FAIL: File lengths differ. MAXIMUM ABS DIFF: None"

        if get_mld:

            reason += " - MLD: None"



        return 1, reason

        return 1, "FAIL: File lengths differ."



    cmp_result = pyaudio3dtools.audioarray.compare(

        s1, s2, fs, per_frame=False, get_mld=get_mld

tests/codec_be_on_mr_nonselection/test_masa_enc_dec.py

+4 −18
Original line number Diff line number Diff line
@@ -42,9 +42,8 @@ from typing import Optional 
import pytest



from tests.cmp_pcm import cmp_pcm

from tests.conftest import DecoderFrontend, EncoderFrontend

from tests.conftest import DecoderFrontend, EncoderFrontend, set_properties



from ..constants import MLD_PATTERN, MAX_DIFF_PATTERN



# params

# output_mode_list = ['MONO', 'STEREO', '5_1', '7_1', '5_1_2', '5_1_4', '7_1_4', 'FOA', 'HOA2', 'HOA3', 'BINAURAL', 'BINAURAL_ROOM', 'EXT']
@@ -220,15 +219,8 @@ def test_masa_enc_dec( 
                mld_lim=get_mld_lim,

                abs_tol=abs_tol,

            )

            if get_mld:

                mld = re.search(MLD_PATTERN, reason).groups(1)[0]

                record_property("MLD", mld)

            

            max_diff = 0

            if pcmcmp_res:

                search_result = re.search(MAX_DIFF_PATTERN, reason)

                max_diff = search_result.groups(1)[0]

            record_property("MAXIMUM ABS DIFF", max_diff)

            set_properties(record_property, reason)



            if get_mld and get_mld_lim > 0:

                if pcmcmp_res != 0:
@@ -257,13 +249,7 @@ def test_masa_enc_dec( 
                    mld_lim=get_mld_lim,

                    abs_tol=abs_tol,

                )

                if get_mld:

                    mld = re.search(MLD_PATTERN, reason).groups(1)[0]

                    record_property("MLD", mld)



                search_result = re.search(MAX_DIFF_PATTERN, reason)

                max_diff = search_result.groups(1)[0]

                record_property("MAXIMUM ABS DIFF", max_diff)

                set_properties(record_property, reason)



                # Report compare result

                if cmp_result != 0:

tests/codec_be_on_mr_nonselection/test_param_file.py

+2 −16
Original line number Diff line number Diff line
@@ -42,9 +42,8 @@ from subprocess import run 
import pytest



from tests.cmp_pcm import cmp_pcm

from tests.conftest import DecoderFrontend, EncoderFrontend

from tests.conftest import DecoderFrontend, EncoderFrontend, set_properties

from tests.testconfig import PARAM_FILE

from ..constants import MLD_PATTERN, MAX_DIFF_PATTERN



VALID_DEC_OUTPUT_CONF = [

    "MONO",
@@ -328,20 +327,7 @@ def test_param_file_tests( 
        )

        md_out_files = get_expected_md_files(ref_output_file, enc_split, output_config)



        if get_mld:

            mld = re.search(MLD_PATTERN, reason).groups(1)[0]

            record_property("MLD", mld)



        max_diff =0

        if output_differs:

            search_result = re.search(MAX_DIFF_PATTERN, reason)

            if search_result:

                max_diff = search_result.groups(1)[0]

            else:

                msg = "Error " + MAX_DIFF_PATTERN + " not found"

                print(msg)

                pytest.fail(msg)

        record_property("MAXIMUM ABS DIFF", max_diff)

        set_properties(record_property, reason)



        metadata_differs = False

        for md_file in md_out_files:

tests/codec_be_on_mr_nonselection/test_sba_bs_dec_plc.py

+2 −11
Original line number Diff line number Diff line
@@ -39,8 +39,7 @@ import re 
import pytest



from tests.cmp_pcm import cmp_pcm

from tests.conftest import DecoderFrontend

from ..constants import MLD_PATTERN, MAX_DIFF_PATTERN

from tests.conftest import DecoderFrontend, set_properties



# params

tag_list = ["stvFOA"]
@@ -214,15 +213,7 @@ def sba_dec_plc( 
            mld_lim=get_mld_lim,

            abs_tol=abs_tol,

        )

        if get_mld:

            mld = re.search(MLD_PATTERN, reason).groups(1)[0]

            record_property("MLD", mld)



        max_diff = 0

        if cmp_result:

            search_result = re.search(MAX_DIFF_PATTERN, reason)

            max_diff = search_result.groups(1)[0]

        record_property("MAXIMUM ABS DIFF", max_diff)

        set_properties(record_property, reason)



        # report compare result

        if cmp_result != 0:

tests/codec_be_on_mr_nonselection/test_sba_bs_enc.py

+2 −11
Original line number Diff line number Diff line
@@ -41,8 +41,7 @@ import pytest 
from cut_bs import cut_from_start



from tests.cmp_pcm import cmp_pcm

from tests.conftest import DecoderFrontend, EncoderFrontend

from ..constants import MLD_PATTERN, MAX_DIFF_PATTERN

from tests.conftest import DecoderFrontend, EncoderFrontend, set_properties



# params
@@ -730,15 +729,7 @@ def sba_dec( 
            mld_lim=get_mld_lim,

            abs_tol=abs_tol,

        )

        if get_mld:

            mld = re.search(MLD_PATTERN, reason).groups(1)[0]

            record_property("MLD", mld)



        max_diff = 0

        if cmp_result:

            search_result = re.search(MAX_DIFF_PATTERN, reason)

            max_diff = search_result.groups(1)[0]

        record_property("MAXIMUM ABS DIFF", max_diff)

        set_properties(record_property, reason)



        # report compare result

        if cmp_result != 0: