diff options
author | Peter Kjellerstedt <peter.kjellerstedt@axis.com> | 2022-01-29 03:29:34 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-02-05 17:46:44 +0000 |
commit | c1117a8eaa60a995968bb32ef0964c07e44524c7 (patch) | |
tree | 9fddf5c5ac9e8021570ba678b718327fe48c9224 /bitbake/lib/bb/tests/fetch.py | |
parent | 803aff81365f07a1ac1fa46a9b842db6ae2c01ed (diff) | |
download | poky-c1117a8eaa60a995968bb32ef0964c07e44524c7.tar.gz |
bitbake: tests/fetch: Improve the verbose messages for skipped tests
This changes:
test_foo .. skipped 'Network tests being skipped'
test_foo .. skipped 'npm not installed, tests being skipped'
to:
test_foo .. skipped 'network test'
test_foo .. skipped 'npm not installed'
to avoid double "skipped" in the output.
(Bitbake rev: e551328a4595c220b94ab5002d978ddb4deeebcf)
Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib/bb/tests/fetch.py')
-rw-r--r-- | bitbake/lib/bb/tests/fetch.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/bitbake/lib/bb/tests/fetch.py b/bitbake/lib/bb/tests/fetch.py index c654662c02..5cccdf6ef4 100644 --- a/bitbake/lib/bb/tests/fetch.py +++ b/bitbake/lib/bb/tests/fetch.py | |||
@@ -18,7 +18,7 @@ from bb.tests.support.httpserver import HTTPService | |||
18 | 18 | ||
19 | def skipIfNoNetwork(): | 19 | def skipIfNoNetwork(): |
20 | if os.environ.get("BB_SKIP_NETTESTS") == "yes": | 20 | if os.environ.get("BB_SKIP_NETTESTS") == "yes": |
21 | return unittest.skip("Network tests being skipped") | 21 | return unittest.skip("network test") |
22 | return lambda f: f | 22 | return lambda f: f |
23 | 23 | ||
24 | class URITest(unittest.TestCase): | 24 | class URITest(unittest.TestCase): |
@@ -2301,7 +2301,7 @@ class NPMTest(FetcherTest): | |||
2301 | def skipIfNoNpm(): | 2301 | def skipIfNoNpm(): |
2302 | import shutil | 2302 | import shutil |
2303 | if not shutil.which('npm'): | 2303 | if not shutil.which('npm'): |
2304 | return unittest.skip('npm not installed, tests being skipped') | 2304 | return unittest.skip('npm not installed') |
2305 | return lambda f: f | 2305 | return lambda f: f |
2306 | 2306 | ||
2307 | @skipIfNoNpm() | 2307 | @skipIfNoNpm() |