Change license holder consolidation logic

    * If we are in a directory with no majority, we check the child directories if they have any majorities and return those
    * This prevents us from reported the same majority thing as we come up the codebase
    * Update tests

Signed-off-by: Jono Yang <jyang@nexb.com>

Author: JonoYang

plugins/scancode-consolidate-scan/src/plugin_consolidate/__init__.py

@@ -319,12 +319,16 @@ def get_license_holders_consolidated_components(codebase):
                 resource.extra_data['origin_summary_holders'] = majority_holders
                 resource.extra_data['origin_summary_count'] = top_count
                 resource.save(codebase)
-
-                c = create_license_holders_consolidated_component(resource, codebase)
-                if c:
-                    yield c
-
-    # TODO: stop if you have a majority but the parent doesnt have it
+            else:
+                # If there is no majority, we see if any of our child directories had majorities
+                for child in children:
+                    if not (child.extra_data.get('origin_summary_license_expression')
+                            and child.extra_data.get('origin_summary_holders')
+                            and child.extra_data.get('origin_summary_count')):
+                        continue
+                    c = create_license_holders_consolidated_component(child, codebase)
+                    if c:
+                        yield c
 
     # Yield a Component for root if there is a majority
     c = create_license_holders_consolidated_component(root, codebase)

plugins/scancode-consolidate-scan/tests/data/plugin_consolidate/clear-summary-expected.json

@@ -30,17 +30,6 @@
       "consolidated_copyright": "Copyright (c) the apache software foundation",
       "other_license_expression": null,
       "other_holders": []
-    },
-    {
-      "type": "license-holders",
-      "identifier": "the_apache_software_foundation_2",
-      "core_license_expression": "apache-2.0",
-      "core_holders": [
-        "the apache software foundation"
-      ],
-      "consolidated_copyright": "Copyright (c) the apache software foundation",
-      "other_license_expression": null,
-      "other_holders": []
     }
   ],
   "consolidated_packages": [],
@@ -70,8 +59,7 @@
       "authors": [],
       "packages": [],
       "consolidated_to": [
-        "the_apache_software_foundation_1",
-        "the_apache_software_foundation_2"
+        "the_apache_software_foundation_1"
       ],
       "files_count": 4,
       "dirs_count": 0,
@@ -150,8 +138,7 @@
       "authors": [],
       "packages": [],
       "consolidated_to": [
-        "the_apache_software_foundation_1",
-        "the_apache_software_foundation_2"
+        "the_apache_software_foundation_1"
       ],
       "files_count": 0,
       "dirs_count": 0,
@@ -230,8 +217,7 @@
       "authors": [],
       "packages": [],
       "consolidated_to": [
-        "the_apache_software_foundation_1",
-        "the_apache_software_foundation_2"
+        "the_apache_software_foundation_1"
       ],
       "files_count": 0,
       "dirs_count": 0,
@@ -310,8 +296,7 @@
       "authors": [],
       "packages": [],
       "consolidated_to": [
-        "the_apache_software_foundation_1",
-        "the_apache_software_foundation_2"
+        "the_apache_software_foundation_1"
       ],
       "files_count": 0,
       "dirs_count": 0,

plugins/scancode-consolidate-scan/tests/data/plugin_consolidate/component-package-expected.json

@@ -3,12 +3,11 @@
     {
       "tool_name": "scancode-toolkit",
       "options": {
-        "input": [
-          "plugins/scancode-consolidate-scan/tests/data/plugin_consolidate/component-package/"
-        ],
+        "input": "<path>",
+        "--consolidate": true,
         "--copyright": true,
         "--info": true,
-        "--json-pp": "/home/jono/component-package.json",
+        "--json": "<file>",
         "--license": true,
         "--package": true
       },
@@ -18,23 +17,6 @@
       "extra_data": {
         "files_count": 7
       }
-    },
-    {
-      "tool_name": "scancode-toolkit",
-      "options": {
-        "input": "<path>",
-        "--consolidate": true,
-        "--from-json": [
-          true
-        ],
-        "--json": "<file>"
-      },
-      "notice": "Generated with ScanCode and provided on an \"AS IS\" BASIS, WITHOUT WARRANTIES\nOR CONDITIONS OF ANY KIND, either express or implied. No content created from\nScanCode should be considered or used as legal advice. Consult an Attorney\nfor any legal advice.\nScanCode is a free software code scanning tool from nexB Inc. and others.\nVisit https://github.com/nexB/scancode-toolkit/ for support and download.",
-      "message": null,
-      "errors": [],
-      "extra_data": {
-        "files_count": 7
-      }
     }
   ],
   "consolidated_components": [