test properly usable_targets with different target types

Signed-off-by: Tomas Tomecek <ttomecek@redhat.com>
user-cont · Sep 11, 2018 · 8e0ff10 · 8e0ff10
1 parent 0b41288
commit 8e0ff10
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 4 deletions.
diff --git a/colin/core/result.py b/colin/core/result.py
@@ -56,6 +56,13 @@ class CheckResults(object):
     def __init__(self, results):
         self.results = CachingIterable(results)
 
+    @property
+    def results_per_check(self):
+        results_per_check = {}
+        for r in self.results:
+            results_per_check[r.check_name] = r
+        return results_per_check
+
     @property
     def _dict_of_results(self):
         """

diff --git a/rulesets/fedora.json b/rulesets/fedora.json
@@ -62,9 +62,7 @@
     },
     {
       "names": [
-        "cmd_or_entrypoint",
         "help_file_or_readme",
-        "no_root",
         "run_or_usage_label"
       ],
       "additional_tags": [

diff --git a/tests/data/Dockerfile b/tests/data/Dockerfile
@@ -10,7 +10,8 @@ LABEL name="${NAME}" \
     com.redhat.component="colin-labels" \
     description="The image contains labels which are used for testing colin functionality." \
     io.k8s.description="The image contains labels which are used for testing colin functionality." \
-    run="docker run <application image>"
+    run="docker run <application image>" \
+    url="https://project.example.com/"
 
 COPY ./files/usage /files/usage
 

diff --git a/tests/integration/test_labels.py b/tests/integration/test_labels.py
@@ -65,7 +65,7 @@ def test_labels_in_image():
                      "run_or_usage_label": "PASS",
                      "release_label": "FAIL",
                      "architecture_label": "FAIL",
-                     "url_label": "FAIL",
+                     "url_label": "PASS",
                      "help_label": "FAIL",
                      "build-date_label": "FAIL",
                      "distribution-scope_label": "FAIL",

diff --git a/tests/integration/test_targets.py b/tests/integration/test_targets.py
@@ -57,6 +57,7 @@ def ruleset():
             },
             {
                 "name": "url_label",
+                "usable_targets": ["image"]
             },
             {
                 "name": "build-date_label",
@@ -105,6 +106,7 @@ def ruleset():
 def test_docker_image_target(ruleset):
     results = colin.run(LABELS_IMAGE, "image", ruleset=ruleset, logging_level=10, pull=False)
     assert results.ok
+    assert results.results_per_check["url_label"].ok
 
 
 def test_dockertar_target(tmpdir, ruleset):
@@ -113,6 +115,7 @@ def test_dockertar_target(tmpdir, ruleset):
     subprocess.check_call(cmd)
     results = colin.run(str(tb), "dockertar", ruleset=ruleset, logging_level=10, pull=False)
     assert results.ok
+    assert results.results_per_check["url_label"].ok
 
 
 def test_ostree_target(ruleset):
@@ -128,3 +131,4 @@ def test_ostree_target(ruleset):
     subprocess.check_call(cmd)
     results = colin.run(skopeo_target, "ostree", ruleset=ruleset, logging_level=10, pull=False)
     assert results.ok
+    assert results.results_per_check["url_label"].ok