Re: [OE-core] [PATCH 1/1] python3: skip tests requiring tools-sdk

["Alexander Kanavin" <alex.kanavin@gmail.com>]

[-- Attachment #1: Type: text/plain, Size: 3710 bytes --]

Wait. How does this work, if IMAGE_FEATURES are set from image recipes, and
not globally?

I'm afraid this may have to be reverted, as it just made it to master.

Alex

On Sat, 19 Jun 2021 at 02:00, Tim Orling <ticotimo@gmail.com> wrote:

> Conditionally skip test_ctypes.test_find unless
> IMAGE_FEATURES contains 'tools-sdk' as these test
> cases require full packagegroup-core-buildessential
>
> Fixes:
>   AssertionError: Failed ptests:
>   {'python3': ['test_find_library_with_gcc', 'test_find_library_with_ld']}
>
> Signed-off-by: Tim Orling <timothy.t.orling@intel.com>
> ---
>  ...pes.test_find-skip-without-tools-sdk.patch | 33 +++++++++++++++++++
>  meta/recipes-devtools/python/python3_3.9.5.bb |  1 +
>  2 files changed, 34 insertions(+)
>  create mode 100644
> meta/recipes-devtools/python/python3/0001-test_ctypes.test_find-skip-without-tools-sdk.patch
>
> diff --git
> a/meta/recipes-devtools/python/python3/0001-test_ctypes.test_find-skip-without-tools-sdk.patch
> b/meta/recipes-devtools/python/python3/0001-test_ctypes.test_find-skip-without-tools-sdk.patch
> new file mode 100644
> index 00000000000..7d684b3c43c
> --- /dev/null
> +++
> b/meta/recipes-devtools/python/python3/0001-test_ctypes.test_find-skip-without-tools-sdk.patch
> @@ -0,0 +1,33 @@
> +From 7a2bddfa437be633bb6945d0e6b7d6f27da870ad Mon Sep 17 00:00:00 2001
> +From: Tim Orling <timothy.t.orling@intel.com>
> +Date: Fri, 18 Jun 2021 11:56:50 -0700
> +Subject: [PATCH] test_ctypes.test_find: skip without tools-sdk
> +
> +These tests need full packagegroup-core-buildessential, the
> +easiest way to dynamically check for that is looking for
> +'tools-sdk' in IMAGE_FEATURES.
> +
> +Upstream-Status: Inappropriate [oe-specific]
> +
> +Signed-off-by: Tim Orling <timothy.t.orlign@intel.com>
> +---
> + Lib/ctypes/test/test_find.py | 2 ++
> + 1 file changed, 2 insertions(+)
> +
> +diff --git a/Lib/ctypes/test/test_find.py b/Lib/ctypes/test/test_find.py
> +index 92ac184..0d009d1 100644
> +--- a/Lib/ctypes/test/test_find.py
> ++++ b/Lib/ctypes/test/test_find.py
> +@@ -112,10 +112,12 @@ class FindLibraryLinux(unittest.TestCase):
> +                 # LD_LIBRARY_PATH)
> +                 self.assertEqual(find_library(libname), 'lib%s.so' %
> libname)
> +
> ++    @unittest.skip("Needs IMAGE_FEATURE += \"tools-sdk\"")
> +     def test_find_library_with_gcc(self):
> +         with unittest.mock.patch("ctypes.util._findSoname_ldconfig",
> lambda *args: None):
> +             self.assertNotEqual(find_library('c'), None)
> +
> ++    @unittest.skip("Needs IMAGE_FEATURE += \"tools-sdk\"")
> +     def test_find_library_with_ld(self):
> +         with unittest.mock.patch("ctypes.util._findSoname_ldconfig",
> lambda *args: None), \
> +              unittest.mock.patch("ctypes.util._findLib_gcc", lambda
> *args: None):
> diff --git a/meta/recipes-devtools/python/python3_3.9.5.bb
> b/meta/recipes-devtools/python/python3_3.9.5.bb
> index f4002f2516f..1717ff737d4 100644
> --- a/meta/recipes-devtools/python/python3_3.9.5.bb
> +++ b/meta/recipes-devtools/python/python3_3.9.5.bb
> @@ -31,6 +31,7 @@ SRC_URI = "
> http://www.python.org/ftp/python/${PV}/Python-${PV}.tar.xz \
>
> file://0020-configure.ac-setup.py-do-not-add-a-curses-include-pa.patch \
>
> file://0001-Lib-sysconfig.py-use-libdir-values-from-configuratio.patch \
>
> file://0001-Skip-failing-tests-due-to-load-variability-on-YP-AB.patch \
> +           ${@bb.utils.contains('IMAGE_FEATURES', 'tools-sdk', '',
> 'file://0001-test_ctypes.test_find-skip-without-tools-sdk.patch', d)} \
>             "
>
>  SRC_URI_append_class-native = " \
> --
> 2.30.2
>
>
> 
>
>

[-- Attachment #2: Type: text/html, Size: 5136 bytes --]