diff --git a/testing/protocol_conformity_1.0/conftest.py b/testing/protocol_conformity_1.0/conftest.py index 190abe9..7b9b0cd 100644 --- a/testing/protocol_conformity_1.0/conftest.py +++ b/testing/protocol_conformity_1.0/conftest.py @@ -1,5 +1,7 @@ # Pass --model_url on to individual tests +import json + def pytest_addoption(parser): parser.addoption("--model_url", action="store", help="what model URL to connect to") parser.addoption("--input_value", action="store", default=0.0, help="value of constant input vector to be passed to the model, since some models may not handle the default well") @@ -11,4 +13,12 @@ def pytest_generate_tests(metafunc): option_value = metafunc.config.option.input_value if 'input_value' in metafunc.fixturenames and option_value is not None: - metafunc.parametrize("input_value", [float(option_value)]) + if isinstance(option_value, str): + option_value = json.loads(option_value) + if isinstance(option_value, list): + option_value = list(map(float, option_value)) + metafunc.parametrize("input_value", [option_value]) + else: + metafunc.parametrize("input_value", [float(option_value)]) + else: + metafunc.parametrize("input_value", [float(option_value)]) diff --git a/testing/protocol_conformity_1.0/test_model_schema.py b/testing/protocol_conformity_1.0/test_model_schema.py index de059c0..c97250f 100644 --- a/testing/protocol_conformity_1.0/test_model_schema.py +++ b/testing/protocol_conformity_1.0/test_model_schema.py @@ -35,8 +35,7 @@ def test_evaluate(model_url, input_value): if input_value_len == 1: inputParams["input"].append([input_value] * inputSizesJSON["inputSizes"][i]) else: - inputParams["input"].append(input_value[i]) - + inputParams["input"].append([input_value][i]) resp = requests.post(f'{model_url}/Evaluate', headers={}, data=json.dumps(inputParams,indent=4))