review fix

tests/README.md

@@ -2,7 +2,7 @@
 
 Installing and running tests
 ```bash
-pip install -r requirements
+pip install -r requirements.txt
 pytest
 ```
 
@@ -11,12 +11,8 @@ Running tests with gpu
 pytest --gpu
 ```
 
-Run tests without re-downloading models
+Run tests while caching downloaded models
 ```bash
 pytest --model-cache ./cache
 ```
 
-All subsequent runs could be made using
-```bash
-pytest --model-cache ./cache --skip-download
-```

tests/conftest.py

@@ -6,8 +6,8 @@
 
 def pytest_addoption(parser):
     parser.addoption("--gpu", action="store_true")
-    parser.addoption("--skip-download", action="store_true")
     parser.addoption("--model-cache", action="store")
+    parser.addoption("--image", action="store")
 
 def pytest_configure(config):
     config.addinivalue_line(

tests/functional/conftest.py

@@ -21,7 +21,7 @@ def triton_server(model_repository, request):
     except socket.error as e:
         if e.errno != errno.EADDRINUSE:
             raise Exception(f"Not expected exception found in port manager: {e.errno}")
-    image_name = os.environ.get("TIS_IMAGE_NAME")
+    image_name = request.config.getoption("--image")
     image_name = image_name if image_name is not None else "tritonserver:latest"
     gpu = '--device /dev/dri --group-add=$(stat -c "%g" /dev/dri/render* )' if request.config.getoption("--gpu") else ""
     subprocess.run(
@@ -55,7 +55,7 @@ def model_cache(request):
         cache = dir.name
     else:
         cache = input_dir
-    if not request.config.getoption("--skip-download"):
+    if os.listdir(cache) == []:
         for model in models:
             MODEL_CONFIG[model]["fetch"](model, cache)
     yield cache