diff --git a/testing/protocol_conformity_1.0/conftest.py b/testing/protocol_conformity_1.0/conftest.py index 7b9b0cd..3cf1fb1 100644 --- a/testing/protocol_conformity_1.0/conftest.py +++ b/testing/protocol_conformity_1.0/conftest.py @@ -1,10 +1,8 @@ # 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") + parser.addoption("--input_value", action="store", default=0.0, help="input vector or constant value to fill the vector to be passed to the model, since some models may not handle the default well. No spaces allowed when inputting vector!") def pytest_generate_tests(metafunc): option_value = metafunc.config.option.model_url @@ -14,11 +12,7 @@ def pytest_generate_tests(metafunc): option_value = metafunc.config.option.input_value if 'input_value' in metafunc.fixturenames and option_value is not None: 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)]) + option_value = eval(option_value) + metafunc.parametrize("input_value", [option_value]) else: metafunc.parametrize("input_value", [float(option_value)])