diff options
Diffstat (limited to 'meta/lib/oeqa/selftest/cases/oelib/license.py')
-rw-r--r-- | meta/lib/oeqa/selftest/cases/oelib/license.py | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/meta/lib/oeqa/selftest/cases/oelib/license.py b/meta/lib/oeqa/selftest/cases/oelib/license.py index 6ebbee589f..3b359396b6 100644 --- a/meta/lib/oeqa/selftest/cases/oelib/license.py +++ b/meta/lib/oeqa/selftest/cases/oelib/license.py | |||
@@ -15,11 +15,11 @@ class SeenVisitor(oe.license.LicenseVisitor): | |||
15 | 15 | ||
16 | class TestSingleLicense(TestCase): | 16 | class TestSingleLicense(TestCase): |
17 | licenses = [ | 17 | licenses = [ |
18 | "GPLv2", | 18 | "GPL-2.0-only", |
19 | "LGPL-2.0", | 19 | "LGPL-2.0-only", |
20 | "Artistic", | 20 | "Artistic-1.0", |
21 | "MIT", | 21 | "MIT", |
22 | "GPLv3+", | 22 | "GPL-3.0-or-later", |
23 | "FOO_BAR", | 23 | "FOO_BAR", |
24 | ] | 24 | ] |
25 | invalid_licenses = ["GPL/BSD"] | 25 | invalid_licenses = ["GPL/BSD"] |
@@ -67,9 +67,9 @@ class TestComplexCombinations(TestSimpleCombinations): | |||
67 | "FOO & (BAR | BAZ)&MOO": ["FOO", "BAR", "MOO"], | 67 | "FOO & (BAR | BAZ)&MOO": ["FOO", "BAR", "MOO"], |
68 | "(ALPHA|(BETA&THETA)|OMEGA)&DELTA": ["OMEGA", "DELTA"], | 68 | "(ALPHA|(BETA&THETA)|OMEGA)&DELTA": ["OMEGA", "DELTA"], |
69 | "((ALPHA|BETA)&FOO)|BAZ": ["BETA", "FOO"], | 69 | "((ALPHA|BETA)&FOO)|BAZ": ["BETA", "FOO"], |
70 | "(GPL-2.0|Proprietary)&BSD-4-clause&MIT": ["GPL-2.0", "BSD-4-clause", "MIT"], | 70 | "(GPL-2.0-only|Proprietary)&BSD-4-clause&MIT": ["GPL-2.0-only", "BSD-4-clause", "MIT"], |
71 | } | 71 | } |
72 | preferred = ["BAR", "OMEGA", "BETA", "GPL-2.0"] | 72 | preferred = ["BAR", "OMEGA", "BETA", "GPL-2.0-only"] |
73 | 73 | ||
74 | class TestIsIncluded(TestCase): | 74 | class TestIsIncluded(TestCase): |
75 | tests = { | 75 | tests = { |
@@ -87,12 +87,12 @@ class TestIsIncluded(TestCase): | |||
87 | [True, ["BAR", "FOOBAR"]], | 87 | [True, ["BAR", "FOOBAR"]], |
88 | ("(FOO | BAR) & FOOBAR | BAZ & MOO & BARFOO", None, "FOO"): | 88 | ("(FOO | BAR) & FOOBAR | BAZ & MOO & BARFOO", None, "FOO"): |
89 | [True, ["BAZ", "MOO", "BARFOO"]], | 89 | [True, ["BAZ", "MOO", "BARFOO"]], |
90 | ("GPL-3.0 & GPL-2.0 & LGPL-2.1 | Proprietary", None, None): | 90 | ("GPL-3.0-or-later & GPL-2.0-only & LGPL-2.1-only | Proprietary", None, None): |
91 | [True, ["GPL-3.0", "GPL-2.0", "LGPL-2.1"]], | 91 | [True, ["GPL-3.0-or-later", "GPL-2.0-only", "LGPL-2.1-only"]], |
92 | ("GPL-3.0 & GPL-2.0 & LGPL-2.1 | Proprietary", None, "GPL-3.0"): | 92 | ("GPL-3.0-or-later & GPL-2.0-only & LGPL-2.1-only | Proprietary", None, "GPL-3.0-or-later"): |
93 | [True, ["Proprietary"]], | 93 | [True, ["Proprietary"]], |
94 | ("GPL-3.0 & GPL-2.0 & LGPL-2.1 | Proprietary", None, "GPL-3.0 Proprietary"): | 94 | ("GPL-3.0-or-later & GPL-2.0-only & LGPL-2.1-only | Proprietary", None, "GPL-3.0-or-later Proprietary"): |
95 | [False, ["GPL-3.0"]] | 95 | [False, ["GPL-3.0-or-later"]] |
96 | } | 96 | } |
97 | 97 | ||
98 | def test_tests(self): | 98 | def test_tests(self): |