Commit b5aa094f authored by emerit's avatar emerit
Browse files

Merge branch '744_step4_hrtf_binary_tests' of... 

Merge branch '744_step4_hrtf_binary_tests' of https://forge.3gpp.org/rep/ivas-codec-pc/ivas-codec into 744_step4_hrtf_binary_tests
parents 19c48a3d e8eaf1dd

tests/conftest.py

+16 −8
Original line number Diff line number Diff line
@@ -404,7 +404,6 @@ class DecoderFrontend: 
            command.extend(["-q"])



        if plc_file is not None:

            

            system = platform.system()



            if system == "Windows":
@@ -425,7 +424,7 @@ class DecoderFrontend: 
            eid_command += [

                str(input_bitstream_path),

                str(plc_file),

                str(input_bitstream_path) + eid_output_suffix

                str(input_bitstream_path) + eid_output_suffix,

            ]



            try:
@@ -440,6 +439,13 @@ class DecoderFrontend: 
        if add_option_list is not None:

            command.extend(add_option_list)



        # TODO add to fix test failed to be removed after merge

        if self._type == "REF":

            if "-hrtf" in command:

                command[command.index("-hrtf") + 1] = command[

                    command.index("-hrtf") + 1

                ]



        # add mandatory parameters

        # output_config is mandatory for IVAS; EVS does not have this parameter, indicated by ""

        if output_config != "":
@@ -454,7 +460,9 @@ class DecoderFrontend: 
        log_dbg_msg(f"{self._type} decoder command:\n{cmd_str}")



        try:

            result = run(command, capture_output=True, check=False, timeout=self.timeout)

            result = run(

                command, capture_output=True, check=False, timeout=self.timeout

            )

        except TimeoutExpired:

            pytest.fail(f"{self._type} decoder run timed out after {self.timeout}s.")