Fix excluded labels check (#213)

Author: simontoens

src/common/label.py

@@ -128,7 +128,9 @@ def __hash__(self):
         return hash((self.repository_prefix, self.package_path, self.target))
 
     def __eq__(self, other):
-        if other is None:
+        if other is self:
+            return True
+        if not isinstance(other, Label):
             return False
         return (self.repository_prefix == other.repository_prefix and
                 self.package_path == other.package_path and

src/config/config.py

@@ -9,6 +9,7 @@
 """
 
 
+from common import label
 from common import logger
 from config import exclusions
 import configparser
@@ -102,7 +103,8 @@ def __init__(self,
 
         # crawler
         self.excluded_dependency_paths = _add_pathsep(_to_tuple(excluded_dependency_paths))
-        self.excluded_dependency_labels = _to_tuple(excluded_dependency_labels)
+        # stored as common.label.Label instances
+        self.excluded_dependency_labels = _to_tuple_of_labels(excluded_dependency_labels)
 
         # artifact
         self.excluded_src_relpaths = _add_pathsep(_to_tuple(excluded_src_relpaths))
@@ -181,6 +183,10 @@ def _to_tuple(thing):
     raise Exception("Cannot convert to tuple [%s] % thing")
 
 
+def _to_tuple_of_labels(thing):
+    return tuple([label.Label(lbl) for lbl in _to_tuple(thing)])
+
+
 def _to_bool(thing):
     if isinstance(thing, bool):
         return thing

src/crawl/crawler.py

@@ -672,7 +672,7 @@ def _partition_and_filter_labels(self, labels):
         return source_labels, deps
 
     def _filter_label(self, label):
-        if label.canonical_form in self.workspace.excluded_dependency_labels:
+        if label in self.workspace.excluded_dependency_labels:
             return None
         elif label.is_source_ref:
             for excluded_dependency_path in self.workspace.excluded_dependency_paths:

src/crawl/workspace.py

@@ -94,9 +94,10 @@ def filter_artifact_producing_packages(self, packages):
 
     def _parse_dep_label(self, dep_label):
         """
-        TODO: this has been move to the crawler class and can be removed.
+        TODO: this has been moved to the crawler class and can be removed.
         """
-        if dep_label in self.excluded_dependency_labels:
+        import common.label
+        if common.label.Label(dep_label) in self.excluded_dependency_labels:
             return None
 
         if dep_label.startswith("@"):

tests/configtest.py

@@ -5,6 +5,7 @@
 For full license text, see the LICENSE file in the repo root or https://opensource.org/licenses/BSD-3-Clause
 """
 
+import common.label as label
 from config import config
 import os
 import tempfile
@@ -186,12 +187,13 @@ def test_excluded_labels(self):
         self._write_file(repo_root, "src/config/pom_template.xml", "foo")
         self._write_file(repo_root, ".pomgenrc", """
 [crawler]
-excluded_dependency_labels=  123    ,   444
+excluded_dependency_labels=  //a/b/c    ,   //a/b/c:foo
 """)
 
         cfg = config.load(repo_root)
 
-        self.assertEqual(("123", "444"), cfg.excluded_dependency_labels)
+        self.assertEqual((label.Label("//a/b/c:c"), label.Label("a/b/c:foo")),
+                         cfg.excluded_dependency_labels)
 
     def test_str(self):
         repo_root = tempfile.mkdtemp("root")

tests/labeltest.py

@@ -117,6 +117,9 @@ def test_eq(self):
         self.assertEqual(n1, n2)
         self.assertFalse(n1 != n2)
 
+        self.assertNotEqual(label.Label("//foo"), None)
+        self.assertNotEqual(label.Label("//foo"), "//foo")
+
     def test_trailing_slash(self):
         n1 = label.Label("//foo/blah/")
         self.assertEqual("blah", n1.target)