Skip to content

Commit cd8389c

Browse files
committed
Correct tests after mass rule update
Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
1 parent 7a6d03e commit cd8389c

File tree

9 files changed

+194
-200
lines changed

9 files changed

+194
-200
lines changed
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
---
22
license_expression: free-unknown
33
is_license_reference: yes
4-
is_required_phrase: yes
4+
skip_for_required_phrase_generation: yes
55
relevance: 100
66
notes: Rule based on an SPDX license name and/or ID. Since we do not track yet license in non-English
77
languages, so this is a rule to deal with this in the short term
88
---
99

10-
Deutsche Freie Software Lizenz
10+
{{Deutsche Freie Software Lizenz}}
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
---
2+
is_false_positive: yes
3+
notes: Note a license
4+
---
5+
6+
Some units are dual licensed and some are specifically Artistic-only.
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
---
22
license_expression: gpl-3.0 AND other-copyleft
33
is_license_notice: yes
4-
is_required_phrase: yes
4+
skip_for_required_phrase_generation: yes
55
relevance: 100
66
---
77

8-
Additional permission under GNU GPL version 3 section 7:
8+
{{Additional permission under GNU GPL version 3 section 7}}
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
---
22
license_expression: other-permissive
33
is_license_notice: yes
4-
is_required_phrase: yes
4+
skip_for_required_phrase_generation: yes
55
relevance: 100
66
---
77

8-
Apache/BSD-style
8+
{{Apache/BSD-style}}
Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
---
22
license_expression: proprietary-license
33
is_license_reference: yes
4-
is_required_phrase: yes
4+
skip_for_required_phrase_generation: yes
5+
relevance: 100
56
---
67

7-
Any use in a commercial product must be notified to the author by email
8-
indicating company name and product name
8+
{{Any use in a commercial product must be notified }} to the author by email
9+
indicating company name and product name
Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
---
22
license_expression: public-domain-disclaimer
33
is_license_text: yes
4-
is_required_phrase: yes
4+
skip_for_required_phrase_generation: yes
55
relevance: 100
66
---
77

8-
Public Domain.
9-
NO WARRANTY EXPRESSED OR IMPLIED. USE AT YOUR OWN RISK.
8+
{{Public Domain.
9+
NO WARRANTY EXPRESSED OR IMPLIED. USE AT YOUR OWN RISK.
10+
}}
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
---
22
license_expression: unknown-license-reference
33
is_license_reference: yes
4-
is_required_phrase: yes
4+
skip_for_required_phrase_generation: yes
55
relevance: 100
66
---
77

8-
dual-licensed
8+
{{dual-licensed}}

tests/formattedcode/data/yaml/package-and-licenses-expected.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -910,9 +910,9 @@ license_rule_references:
910910
is_license_tag: no
911911
is_license_intro: no
912912
is_license_clue: no
913-
is_required_phrase: no
913+
is_required_phrase: yes
914914
skip_for_required_phrase_generation: no
915-
is_continuous: yes
915+
is_continuous: no
916916
is_builtin: yes
917917
is_from_license: no
918918
is_synthetic: no
@@ -926,7 +926,7 @@ license_rule_references:
926926
ignorable_authors: []
927927
ignorable_urls: []
928928
ignorable_emails: []
929-
text: '{{apache-2.0 OR MIT}}'
929+
text: apache-2.0 OR MIT
930930
- license_expression: mit
931931
identifier: mit.LICENSE
932932
language: en

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

Lines changed: 169 additions & 183 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)