Merge pull request #120 from 2gis/I-119

Fix --skip-tags evaluation logic
2gis · Mar 19, 2020 · 3700f5b · 3700f5b
2 parents 0ce48ec + 67838bf
commit 3700f5b
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/k8s_handle/templating.py b/k8s_handle/templating.py
@@ -195,7 +195,10 @@ def _get_template_tags(template):
 
     @staticmethod
     def _evaluate_tags(tags, only_tags, skip_tags):
-        if only_tags is None and skip_tags is None:
-            return True
+        if only_tags and tags.isdisjoint(only_tags):
+            return False
 
-        return tags.isdisjoint(skip_tags or []) and not tags.isdisjoint(only_tags or tags)
+        if skip_tags and not tags.isdisjoint(skip_tags):
+            return False
+
+        return True
diff --git a/tests/test_templating.py b/tests/test_templating.py
@@ -111,6 +111,9 @@ def test_evaluate_tags(self):
         self.assertFalse(r._evaluate_tags(tags, only_tags=['tag1'], skip_tags=['tag1']))
         self.assertFalse(r._evaluate_tags(tags, only_tags=None, skip_tags=['tag1']))
         self.assertTrue(r._evaluate_tags(tags, only_tags=None, skip_tags=['tag4']))
+        tags = set()
+        self.assertFalse(r._evaluate_tags(tags, only_tags=['tag4'], skip_tags=None))
+        self.assertTrue(r._evaluate_tags(tags, only_tags=None, skip_tags=['tag4']))
 
     def test_get_template_tags(self):
         r = templating.Renderer(os.path.join(os.path.dirname(__file__), 'templates_tests'))