Skip to content

Commit 9ba52a9

Browse files
Fix test failures
Signed-off-by: Ayan Sinha Mahapatra <ayansmahapatra@gmail.com>
1 parent 338a445 commit 9ba52a9

File tree

8 files changed

+87
-93
lines changed

8 files changed

+87
-93
lines changed

src/licensedcode/data/rules/new-relic-1.0_required_phrase_1.RULE

Lines changed: 0 additions & 7 deletions
This file was deleted.

src/licensedcode/data/rules/proprietary-license_663.RULE

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,17 @@
11
---
22
license_expression: proprietary-license
33
is_license_text: yes
4+
is_deprecated: yes
5+
replaced_by:
6+
- mediatek-proprietary-2016
7+
- mediatek-proprietary-2016
8+
- unknown-license-reference
49
ignorable_copyrights:
510
- MediaTek Inc. (c)
611
ignorable_holders:
712
- MediaTek Inc.
813
ignorable_authors:
914
- MediaTek Inc.
10-
is_deprecated: yes
11-
replaced_by:
12-
- mediatek-proprietary-2016
1315
---
1416

1517
This software/firmware and related documentation ("MediaTek Software") are
Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,4 @@
11
license_expressions:
2-
- proprietary-license
2+
- mediatek-proprietary-2016
3+
- mediatek-proprietary-2016
4+
- unknown-license-reference

tests/licensedcode/data/licenses_reference_reporting/license-reference-works-with-clues.expected.json

Lines changed: 67 additions & 70 deletions
Large diffs are not rendered by default.
Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
[
22
[
33
"SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception",
4-
180,
5-
206
4+
181,
5+
207
66
],
77
[
88
"SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception",
9-
494,
10-
520
9+
495,
10+
521
1111
]
1212
]
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[
22
[
33
"SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception",
4-
210,
5-
236
4+
211,
5+
237
66
]
77
]

tests/licensedcode/test_detect.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1075,8 +1075,8 @@ def test_match_has_correct_line_positions_in_automake_perl_file(self):
10751075
expected = [
10761076
# detected, match.lines(), match.qspan,
10771077
('gpl-2.0-plus', (12, 25), Span(51, 160)),
1078-
('fsf-unlimited-no-warranty', (231, 238), Span(979, 1042)),
1079-
('warranty-disclaimer', (306, 307), Span(1352, 1374)),
1078+
('fsf-unlimited-no-warranty', (231, 238), Span(984, 1047)),
1079+
('warranty-disclaimer', (306, 307), Span(1357, 1379)),
10801080
]
10811081
self.check_position('positions/automake.pl', expected)
10821082

tests/packagedcode/data/rpm_installed/end-to-end/bdb-fedora-rootfs.tar.xz-expected.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31133,15 +31133,15 @@
3113331133
"end_line": 1,
3113431134
"matcher": "5-undetected",
3113531135
"score": 100.0,
31136-
"matched_length": 1,
31136+
"matched_length": 2,
3113731137
"match_coverage": 100.0,
3113831138
"rule_relevance": 100,
3113931139
"rule_identifier": "package-manifest-unknown-b9931200c2f732e2ea95da8f66af5f41a403ecf7",
3114031140
"rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/package-manifest-unknown-b9931200c2f732e2ea95da8f66af5f41a403ecf7",
3114131141
"matched_text": "license pubkey"
3114231142
}
3114331143
],
31144-
"identifier": "unknown-215a841a-e3aa-2ed9-9dfb-b6db7f0096e1"
31144+
"identifier": "unknown-6638c8ac-18c2-ed3f-78bb-1c72e6cc0939"
3114531145
}
3114631146
],
3114731147
"other_license_expression": null,
@@ -260980,15 +260980,15 @@
260980260980
"end_line": 1,
260981260981
"matcher": "5-undetected",
260982260982
"score": 100.0,
260983-
"matched_length": 1,
260983+
"matched_length": 2,
260984260984
"match_coverage": 100.0,
260985260985
"rule_relevance": 100,
260986260986
"rule_identifier": "package-manifest-unknown-b9931200c2f732e2ea95da8f66af5f41a403ecf7",
260987260987
"rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/package-manifest-unknown-b9931200c2f732e2ea95da8f66af5f41a403ecf7",
260988260988
"matched_text": "license pubkey"
260989260989
}
260990260990
],
260991-
"identifier": "unknown-215a841a-e3aa-2ed9-9dfb-b6db7f0096e1"
260991+
"identifier": "unknown-6638c8ac-18c2-ed3f-78bb-1c72e6cc0939"
260992260992
}
260993260993
],
260994260994
"other_license_expression": null,

0 commit comments

Comments
 (0)