Commit cf15e48a authored by emerit's avatar emerit
Browse files

fix pytest failed when -n option > 1

parent d271790f

tests/binaural/utils.py

+9 −3
Original line number Diff line number Diff line
@@ -37,6 +37,7 @@ import sys 
from typing import Dict, Optional, Tuple

import numpy as np

import os

import uuid



from .constants import *

from .compare_audio import compare_audio_arrays
@@ -295,10 +296,11 @@ def compare_rom_vs_binary( 
    in_fs,

    out_fmt, 

    out_fs,

    keep_file: Optional[bool] = False,

    trj_file: Optional[str] = None

):

    option_str = "_".join(get_option_list_str(option_list_enc))

    file_ext = f"_{option_str}_{bitrate}_{in_fs}-{out_fs}_{out_fmt}"

    file_ext = f"_{option_str or ''}_{bitrate or ''}_{in_fs or ''}-{out_fs or ''}_{out_fmt or ''}-{uuid.uuid1()} "



    #check_binary_file(out_fs)
@@ -325,3 +327,7 @@ def compare_rom_vs_binary( 
    out_bin, out_bin_fs = pyaudio3dtools.audiofile.readfile(out_rom_path)



    check_BE(test_info, out_rom, out_rom_fs, out_bin, out_bin_fs)

    if keep_file==False:

        os.remove(bitstream_path)

        os.remove(out_rom_path)

        os.remove(out_bin_path)
 
 No newline at end of file

tests/renderer/utils.py

+13 −9
Original line number Diff line number Diff line
@@ -40,6 +40,8 @@ from typing import Dict, Optional, Tuple 


import numpy as np

import pytest

import uuid





from .compare_audio import compare_audio_arrays

from .constants import *
@@ -167,7 +169,7 @@ def run_renderer( 


    out_file = str(

        output_path_base.joinpath(

            f"{in_name}_to_{out_name}{trj_name}{non_diegetic_pan}{refrot_name}{refvec_name}{refveclev_name}{config_name}{framing_name}{hrtf_file_name}{name_extension}.wav"

            f"{in_name}_to_{out_name}{trj_name or ''}{non_diegetic_pan or ''}{refrot_name or ''}{refvec_name or ''}{refveclev_name or ''}{config_name or ''}{framing_name or ''}{hrtf_file_name or ''}{name_extension or ''}{uuid.uuid1()}.wav"

        )

    )
@@ -208,7 +210,7 @@ def run_renderer( 


    if hrtf_file_name is not None:

        if hrtf_file_path is not None:

            cmd.extend(["-hrtf", str(hrtf_file_path.joinpath(hrtf_file_name))])

            cmd.extend(["-hrtf", str(hrtf_file_path.joinpath(f"{hrtf_file_name}.bin"))])



    # Set env variables for UBSAN

    env = os.environ.copy()
@@ -222,7 +224,7 @@ def run_renderer( 
    return pyaudio3dtools.audiofile.readfile(out_file), out_file





def compare_renderer_vs_mergetarget(test_info, in_fmt, out_fmt, **kwargs):

def compare_renderer_vs_mergetarget(test_info, in_fmt, out_fmt, keep_files = False, **kwargs):

    [[ref, ref_fs], out_ref]= run_renderer(

        in_fmt,

        out_fmt,
@@ -235,6 +237,7 @@ def compare_renderer_vs_mergetarget(test_info, in_fmt, out_fmt, **kwargs): 
        in_fmt, out_fmt, test_case_name=test_info.node.name, **kwargs

    )

    check_BE(test_info, ref, ref_fs, cut, cut_fs)

    if keep_files == False:

        os.remove(out_ref)

        os.remove(out_cut)
@@ -257,7 +260,7 @@ def compare_renderer_args( 
    )

    check_BE(test_info, ref, ref_fs, cut, cut_fs)



def compare_renderer_vs_renderer_with_binary_hrir(test_info, in_fmt, out_fmt, **kwargs):

def compare_renderer_vs_renderer_with_binary_hrir(test_info, in_fmt, out_fmt, keep_files = False, **kwargs):

    

    hrtf_file_dir = SCRIPTS_DIR.joinpath("binauralRenderer_interface/binaural_renderers_hrtf_data")

    [[ref, ref_fs], outfile_ref] = run_renderer(
@@ -266,13 +269,14 @@ def compare_renderer_vs_renderer_with_binary_hrir(test_info, in_fmt, out_fmt, ** 
        test_case_name=test_info.node.name,

        output_path_base=OUTPUT_PATH_REF,

        hrtf_file_path = hrtf_file_dir,

        hrtf_file_name = "ivas_binaural_48kHz.bin",

        hrtf_file_name = "ivas_binaural_48kHz",

        **kwargs,

    )

    [[cut, cut_fs], outfile_cut]= run_renderer(

        in_fmt, out_fmt, test_case_name=test_info.node.name, **kwargs

    )

    check_BE(test_info, ref, ref_fs, cut, cut_fs)

    if keep_files == False :

        os.remove(outfile_ref)

        os.remove(outfile_cut)