Skip to content

Commit a16a2aa

Browse files
authored
Adoptions for Diagnostics (#75)
* 90 percent only and ignoring Changelog Signed-off-by: Christian Henkel <christian.henkel2@de.bosch.com> * license in code is declared correctly Signed-off-by: Christian Henkel <christian.henkel2@de.bosch.com> * also here bsd-3-clause is correct Signed-off-by: Christian Henkel <christian.henkel2@de.bosch.com> --------- Signed-off-by: Christian Henkel <christian.henkel2@de.bosch.com>
1 parent 3c08378 commit a16a2aa

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

src/ros_license_toolkit/common.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,11 @@
1919
import os
2020
from typing import Any, Dict, List, Optional
2121

22-
REQUIRED_PERCENTAGE_OF_LICENSE_TEXT = 95.0
22+
REQUIRED_PERCENTAGE_OF_LICENSE_TEXT = 90.0
2323

2424
# files we ignore in scan results
2525
IGNORED = [
26+
"CHANGELOG.rst",
2627
".scanignore",
2728
"package.xml",
2829
"setup.py",

test/systemtest/test_separate_pkgs.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ def test_pkg_one_correct_one_license_file_missing(self):
163163
process, stdout = open_subprocess("test_pkg_one_correct_one_license_file_missing")
164164
self.assertEqual(os.EX_DATAERR, process.returncode)
165165
self.assertTrue(
166-
check_output_status(stdout, WARNING, SUCCESS, WARNING, FAILURE, FAILURE, SUCCESS)
166+
check_output_status(stdout, WARNING, SUCCESS, WARNING, FAILURE, SUCCESS, SUCCESS)
167167
)
168168

169169
def test_pkg_scheme1_conform(self):
@@ -274,9 +274,10 @@ def test_pkg_with_multiple_licenses_one_referenced_incorrect(self):
274274
"test_pkg_with_multiple_licenses_one_referenced_incorrect"
275275
)
276276
self.assertEqual(os.EX_OK, process.returncode)
277+
print(stdout)
277278
self.assertIn(b"WARNING Licenses ['BSD'] are not in SPDX list", stdout)
278279
self.assertTrue(
279-
check_output_status(stdout, WARNING, SUCCESS, WARNING, WARNING, WARNING, WARNING)
280+
check_output_status(stdout, WARNING, SUCCESS, WARNING, WARNING, SUCCESS, WARNING)
280281
)
281282

282283
def test_pkg_wrong_license_file(self):

0 commit comments

Comments
 (0)