Make some tests ignored instead of disabled.

This is needed because their Python imports already fail.

1 files changed, 12 insertions, 6 deletions

diff --git a/debian/tests/upstream.py b/debian/tests/upstream.py
index 3c23027c..51265ec0 100644
--- a/debian/tests/upstream.py
+++ b/debian/tests/upstream.py
@@ -2,19 +2,25 @@ import sys
 import itertools
 import pytest
 
-blacklist = ["test_dtm.py", # Requires hnswlib
-             "test_knn.py", # Requires pykeops
+blacklist = ["test_knn.py", # Requires pykeops
              "test_representations.py", # Look into this
              "test_tomato.py", # Wants to use X.
-             "test_wasserstein_distance.py::test_wasserstein_distance_grad", # Requires PyTorch.
-             "test_wasserstein_with_tensors.py" # Requires PyTorch and TF.
-            ] 
+             "test_wasserstein_distance.py::test_wasserstein_distance_grad" # Requires PyTorch.
+            ]
 
 print("Blacklist: %s" %(str(blacklist)))
 
+# These should be completely ignored, not even loaded (their imports fail).
+ignorelist = ["test_dtm.py", # Requires hnswlib.
+              "test_wasserstein_with_tensors.py" # Requires PyTorch and TF
+            ]
+
+print("Ignorelist:", ignorelist)
+
 testdir = sys.argv[1]
 
 deselect_args = list(itertools.chain.from_iterable([["--deselect", "%s/%s" %(testdir, exclude)] for exclude in blacklist]))
+ignore_args = list(itertools.chain.from_iterable([["--ignore-glob", "%s/%s" %(testdir, exclude)] for exclude in ignorelist]))
 
-exitcode = pytest.main([testdir] + deselect_args)
+exitcode = pytest.main([testdir] + deselect_args + ignore_args)
 exit(exitcode)