summaryrefslogtreecommitdiffstats
path: root/bitbake/lib/bb
diff options
context:
space:
mode:
authorStefan Herbrechtsmeier <stefan.herbrechtsmeier@weidmueller.com>2024-12-09 11:31:56 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2024-12-20 16:18:59 +0000
commit527e4a79580c017795bee234664bdd1040e38ec9 (patch)
tree21ccb1e2bad3fdc8461839480bd2a90023cb5dfe /bitbake/lib/bb
parent243f9ea0600f3a125a9becaa32af298fc4b1b77d (diff)
downloadpoky-527e4a79580c017795bee234664bdd1040e38ec9.tar.gz
bitbake: tests: fetch: do not skip plain npmsw tests
The npmsw fetcher doesn't use the npm command. Remove the `@skipIfNoNpm()` decorator from plain npmsw tests which don't use the npm fetcher. (Bitbake rev: 48f9964a19b8e2e3a73667c9889908eceecf7719) Signed-off-by: Stefan Herbrechtsmeier <stefan.herbrechtsmeier@weidmueller.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib/bb')
-rw-r--r--bitbake/lib/bb/tests/fetch.py6
1 files changed, 0 insertions, 6 deletions
diff --git a/bitbake/lib/bb/tests/fetch.py b/bitbake/lib/bb/tests/fetch.py
index 01ca807247..3eaaa83620 100644
--- a/bitbake/lib/bb/tests/fetch.py
+++ b/bitbake/lib/bb/tests/fetch.py
@@ -2840,7 +2840,6 @@ class NPMTest(FetcherTest):
2840 json.dump(data, f) 2840 json.dump(data, f)
2841 return swfile 2841 return swfile
2842 2842
2843 @skipIfNoNpm()
2844 @skipIfNoNetwork() 2843 @skipIfNoNetwork()
2845 def test_npmsw(self): 2844 def test_npmsw(self):
2846 swfile = self.create_shrinkwrap_file({ 2845 swfile = self.create_shrinkwrap_file({
@@ -2875,7 +2874,6 @@ class NPMTest(FetcherTest):
2875 self.assertTrue(os.path.exists(os.path.join(self.unpackdir, 'node_modules', 'array-flatten', 'node_modules', 'content-type', 'package.json'))) 2874 self.assertTrue(os.path.exists(os.path.join(self.unpackdir, 'node_modules', 'array-flatten', 'node_modules', 'content-type', 'package.json')))
2876 self.assertTrue(os.path.exists(os.path.join(self.unpackdir, 'node_modules', 'array-flatten', 'node_modules', 'content-type', 'node_modules', 'cookie', 'package.json'))) 2875 self.assertTrue(os.path.exists(os.path.join(self.unpackdir, 'node_modules', 'array-flatten', 'node_modules', 'content-type', 'node_modules', 'cookie', 'package.json')))
2877 2876
2878 @skipIfNoNpm()
2879 @skipIfNoNetwork() 2877 @skipIfNoNetwork()
2880 def test_npmsw_git(self): 2878 def test_npmsw_git(self):
2881 swfile = self.create_shrinkwrap_file({ 2879 swfile = self.create_shrinkwrap_file({
@@ -2914,7 +2912,6 @@ class NPMTest(FetcherTest):
2914 fetcher.download() 2912 fetcher.download()
2915 self.assertTrue(os.path.exists(os.path.join(self.dldir, 'git2', 'gitlab.com.gitlab-examples.nodejs.git'))) 2913 self.assertTrue(os.path.exists(os.path.join(self.dldir, 'git2', 'gitlab.com.gitlab-examples.nodejs.git')))
2916 2914
2917 @skipIfNoNpm()
2918 @skipIfNoNetwork() 2915 @skipIfNoNetwork()
2919 def test_npmsw_dev(self): 2916 def test_npmsw_dev(self):
2920 swfile = self.create_shrinkwrap_file({ 2917 swfile = self.create_shrinkwrap_file({
@@ -2943,7 +2940,6 @@ class NPMTest(FetcherTest):
2943 self.assertTrue(os.path.exists(os.path.join(self.dldir, 'npm2', 'array-flatten-1.1.1.tgz'))) 2940 self.assertTrue(os.path.exists(os.path.join(self.dldir, 'npm2', 'array-flatten-1.1.1.tgz')))
2944 self.assertTrue(os.path.exists(os.path.join(self.dldir, 'npm2', 'content-type-1.0.4.tgz'))) 2941 self.assertTrue(os.path.exists(os.path.join(self.dldir, 'npm2', 'content-type-1.0.4.tgz')))
2945 2942
2946 @skipIfNoNpm()
2947 @skipIfNoNetwork() 2943 @skipIfNoNetwork()
2948 def test_npmsw_destsuffix(self): 2944 def test_npmsw_destsuffix(self):
2949 swfile = self.create_shrinkwrap_file({ 2945 swfile = self.create_shrinkwrap_file({
@@ -2998,7 +2994,6 @@ class NPMTest(FetcherTest):
2998 fetcher.unpack(self.unpackdir) 2994 fetcher.unpack(self.unpackdir)
2999 self.assertTrue(os.path.exists(os.path.join(self.unpackdir, 'node_modules', 'array-flatten', 'package.json'))) 2995 self.assertTrue(os.path.exists(os.path.join(self.unpackdir, 'node_modules', 'array-flatten', 'package.json')))
3000 2996
3001 @skipIfNoNpm()
3002 @skipIfNoNetwork() 2997 @skipIfNoNetwork()
3003 def test_npmsw_npm_reusability(self): 2998 def test_npmsw_npm_reusability(self):
3004 # Fetch once with npmsw 2999 # Fetch once with npmsw
@@ -3021,7 +3016,6 @@ class NPMTest(FetcherTest):
3021 fetcher.unpack(self.unpackdir) 3016 fetcher.unpack(self.unpackdir)
3022 self.assertTrue(os.path.exists(os.path.join(self.unpackdir, 'npm', 'package.json'))) 3017 self.assertTrue(os.path.exists(os.path.join(self.unpackdir, 'npm', 'package.json')))
3023 3018
3024 @skipIfNoNpm()
3025 @skipIfNoNetwork() 3019 @skipIfNoNetwork()
3026 def test_npmsw_bad_checksum(self): 3020 def test_npmsw_bad_checksum(self):
3027 # Try to fetch with bad checksum 3021 # Try to fetch with bad checksum