From b58112e5af484d9314f6a4487b1bc8b292f952ef Mon Sep 17 00:00:00 2001 From: Patrick Williams Date: Thu, 7 Mar 2024 11:16:36 -0600 Subject: subtree updates MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit meta-raspberrypi: 95a9103f91..92a9b7a012: Michał Kluska (1): rpi-base: Added missing HiFiBerry meta-openembedded: 9f0e513211..a0237019f5: Alexander Stein (1): libkcapi: Update HOMEPAGE url Changqing Li (4): syslog-ng: upgrade 4.0.1 -> 4.6.0 multipath-tools: upgrade 0.9.3 -> 0.9.8 nodejs: upgrade 20.11.0 -> 20.11.1 postgresql: upgrade 15.5 -> 16.2 Joe Slater (1): googletest: allow for shared libraries Khem Raj (17): python3-fastjsonschema: Add missing ptest deps python3-gpiod: Tests rely on configfs support in kernel python3-pyzmq: Add missing dep on python3-unixadmin for ptests python3-betamax: Upgrade to 0.9.0 libgpiod: Tests rely on configfs support in kernel keyutils: Add missing rdep for ptests fuse3: Make kmod as a recommendation instead of rdep for ptests drbd-utils: Disable warnings as errors influxdb: Define GOPROXY crucible: Define GOPROXY syzkaller: Fix build with go 1.21 e2tools: Delete unneeded files from ptest package ptest-packagelists-meta-oe: Move libgpiod out of PTESTS_PROBLEMS_META_OE ptest-packagelists-meta-python: Move py3-libgpiod out of PTESTS_PROBLEMS_META_PYTHON pgpool2: Upgrade to 4.5.1 pgpool2: Fix build with postgresql 16+ emacs: Add packageconfig for selinux support Krupal Ka Patel (1): python3-aiohappyeyeballs: Correct the typo of BBCLASSEXTEND Markus Volk (3): folks: update 0.15.6 -> 0.15.7 mozjs-115: update 115.6.0 -> 115.8.0 polkit: update 123 -> 124 Martin Jansa (3): ristretto: use python3native and depend on glib-2.0-native, python3-packaging-native xfce4-notifyd: use python3native and depend on python3-packaging-native fuse3: use 4 spaces for indentation Mingli Yu (1): nlohmann-json: Upgrade to 3.11.3 Randolph Sapp (1): glmark2: add upstream patch to not care about stencil config Ulrich Ölmann (1): signing.bbclass: fix typos Xiangyu Chen (3): iperf3: upgrade 3.15 -> 3.16 grpc: upgrade 1.60.0 -> 1.60.1 drbd-utils: upgrade 9.22.0 -> 9.27.0 Yi Zhao (7): openipmi: fix do_configure error when using dash cryptsetup: upgrade 2.6.1 -> 2.7.0 layer.conf: Add nativesdk-libdevmapper PREFERRED_RPROVIDER krb5: upgrade 1.20.2 -> 1.21.2 postfix: upgrade 3.7.3 -> 3.8.5 openldap: upgrade 2.5.16 -> 2.6.7 openvpn: upgrade 2.6.7 -> 2.6.9 Yoann Congal (3): drbd-utils: Drop a duplicated line in DESCRIPTION drbd-utils: Fix a udev rule reproducibility toybox-inittab: Fix serial getty reproducibility alperak (9): python3-google-auth: upgrade 2.28.0 -> 2.28.1 python3-netaddr: upgrade 0.10.1 -> 1.2.1 and add ptest ptest-packagelists-meta-python: Move python3-xlrd from PTESTS_PROBLEMS_META_PYTHON to PTESTS_FAST_META_PYTHON python3-wrapt: add ptest python3-freezegun: add recipe and add ptest python3-dateutil: upgrade 2.8.2 -> 2.9.0 python3-types-python-dateutil: add recipe python3-arrow: add ptest, update backend and runtime dependencies python3-marshmallow: upgrade 3.20.2 -> 3.21.1 and add ptest poky: 25d60ac6f6..7165c23237: Alexander Kanavin (48): xz: correct upstream version check python3-sphinxcontrib-jquery: add a recipe and make python3-sphinx-rtd-theme depend on it acl: upgrade 2.3.1 -> 2.3.2 appstream: upgrade 1.0.0 -> 1.0.2 boost: upgrade 1.83.0 -> 1.84.0 btrfs-tools: upgrade 6.5.3 -> 6.7.1 dnf: upgrade 4.18.2 -> 4.19.0 diffoscope: upgrade 253 -> 259 ell: upgrade 0.62 -> 0.63 elfutils: upgrade 0.189 -> 0.191 epiphany: upgrade 45.1 -> 45.3 gettext: upgrade 0.22.4 -> 0.22.5 glib-2.0: upgrade 2.78.3 -> 2.78.4 glib-networking: upgrade 2.78.0 -> 2.78.1 kmscube: upgrade to latest revision libbsd: upgrade 0.11.8 -> 0.12.1 libdnf: update 0.72.0 -> 0.73.0 libpciaccess: upgrade 0.17 -> 0.18 libpcre2: upgrade 10.42 -> 10.43 librepo: update 1.16.0 -> 1.17.0 libusb1: upgrade 1.0.26 -> 1.0.27 libxml2: upgrade 2.11.5 -> 2.12.5 linux-firmware: upgrade 20231211 -> 20240220 librsvg: upgrade 2.56.3 -> 2.57.1 lsof: upgrade 4.98.0 -> 4.99.3 man-pages: upgrade 6.05.01 -> 6.06 mc: upgrade 4.8.30 -> 4.8.31 mesa: upgrade 24.0.1 -> 24.0.2 minicom: upgrade 2.8 -> 2.9 nghttp2: upgrade 1.59.0 -> 1.60.0 orc: upgrade 0.4.37 -> 0.4.38 puzzles: upgrade to latest revision piglit: upgrade to latest revision python3-build: upgrade 1.0.3 -> 1.1.1 python3-dtschema: upgrade 2023.7 -> 2024.2 python3-jsonschema: upgrade 4.17.3 -> 4.21.1 and add new dependencies python3-ruamel-yaml: upgrade 0.17.35 -> 0.18.6 python3-setuptools: upgrade 69.0.3 -> 69.1.1 python3-wcwidth: upgrade 0.2.12 -> 0.2.13 repo: upgrade 2.41 -> 2.42 shaderc: update 2023.7 -> 2023.8 systemd: upgrade 255.1 -> 255.4 ttyrun: upgrade 2.30.0 -> 2.31.0 taglib: upgrade 1.13.1 -> 2.0 and add utfcpp recipe to support that update-rc.d: upgrade to latest revision vala: upgrade 0.56.13 -> 0.56.15 vulkan: upgrade 1.3.268.0 -> 1.3.275.0 webkitgtk: upgrade 2.42.2 -> 2.42.5 Bruce Ashfield (3): linux-yocto/cfg/6.6: drop CONFIG_DEBUG_CREDENTIALS linux-yocto/6.6: update to v6.6.20 linux-yocto/6.6: update CVE exclusions Changqing Li (3): rxvt-unicode: Fix installing of terminfo systemd: fix dead link /var/log/README go: filter out build specific path from the linker flags Chen Qi (2): systemd: use RDEPENDS for systemd-vconsole-setup systemd: remove systemd-bus-proxy settings Christian Taedcke (1): image_types.bbclass: fix vfat image names Eilís 'pidge' Ní Fhlannagáin (6): qemurunner.py: Fix error on calls to run_monitor screenshot-tests: Add initial screenshot test png files for core-image-sato oeqa/runtime/login: Proof of concept for screenshot testcases oeqa/runtime/login: Exclude qemuriscv64 oeqa/runtime/login: Add screenshot sample logic/timeout/dbus-wait sstatetests.py: Add testing for correct sstate permissions Fabio Estevam (1): u-boot: Move UBOOT_INITIAL_ENV back to u-boot.inc Geoff Parker (1): ref-manual: variables: adding multiple groups in GROUPADD_PARAM Johan Bezem (1): ref-manual: variables: correct sdk installation default path Jose Quaresma (7): go: rework patch to avoid identation go: bump 1.21.0 goarch: disable dynamic linking globally oeqa/gotoolchain: set GOPROXY go: upgrade 1.21.0 -> 1.21.5 go: upgrade 1.21.5 -> 1.21.7 go: bump 1.22.0 Khem Raj (4): mesa,mesa-gl: Fix build when dri3 is not enabled linux-yocto: Enable gpio-sim with ptests rust: Fix build failure re-appeared on riscv32 gdb: Upgrade 14.1 -> 14.2 Luca Ceresoli (2): ref-manual: tasks: do_cleanall: recommend using '-f' instead ref-manual: tasks: do_cleansstate: recommend using '-f' instead for a shared sstate Markus Volk (1): gtk+3: update 3.24.38 -> 3.24.41 Michael Opdenacker (4): core-image-full-cmdline: add package-management bitbake: utils: remove BB_ENV_PASSTHROUGH from preserved_envvars() dev-manual: packages: fix capitalization manuals: document VIRTUAL-RUNTIME variables Randy MacLeod (1): valgrind: skip intermittently failing ptests Richard Purdie (9): no-gplv3: Tweak for packagemangement in core-image-full-cmdline qemu: Replace workaround with proper usermode fix for shmat bitbake: fetch/git: Avoid clean upon failure go: Further tweak indentation in patch go: Drop linkmode with nativesdk/cross-canadian libpng: Update SRC_URI to avoid redirects oeqa/runtime/login: Various code improvements and fixes oeqa/runtime/login: Mask out the mouse panel icon for now oeqa/runtime/login: Fix dbus-wait timeout and loop conditional Robert P. J. Day (1): python3-cryptography_42.0.5.bb: delete redundant ptest packaging Ross Burton (2): Add genericarm64 MACHINE rxvt: add rxvt to desktop entry name Simone Weiß (4): coreutils: backport patch to fix heap overflow in split qemu: backport patch for ui/clipboard issue ref-manual: classes: add cve status check for oe.qa contributor-guide: add notes for tests Tim Orling (1): python3-hypothesis: upgrade 6.98.12 -> 6.98.15 Trevor Woerner (2): bmaptool: now part of Yocto Project dev-manual: bmaptool: rename Yi Zhao (1): expat: upgrdae 2.6.0 -> 2.6.1 Yoann Congal (1): bitbake: prserv/serv: Fix a PID file removal race on prserv stop Change-Id: Ie94e4df79e3d8f68aea3377f816d7106987a05f8 Signed-off-by: Patrick Williams --- ...01-Drop-ptests-fixtures-and-recorde_modes.patch | 42 +++++++++++++--------- 1 file changed, 26 insertions(+), 16 deletions(-) (limited to 'meta-openembedded/meta-python/recipes-devtools/python/python3-betamax') diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-betamax/0001-Drop-ptests-fixtures-and-recorde_modes.patch b/meta-openembedded/meta-python/recipes-devtools/python/python3-betamax/0001-Drop-ptests-fixtures-and-recorde_modes.patch index 7adcb68324..52745a9373 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-betamax/0001-Drop-ptests-fixtures-and-recorde_modes.patch +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-betamax/0001-Drop-ptests-fixtures-and-recorde_modes.patch @@ -1,7 +1,7 @@ -From 0e0b63ae80df5d7849b2e1c5ab9a668e8378b5e8 Mon Sep 17 00:00:00 2001 +From e5aa66b1af2d49f159c4daefc598f96744ee988d Mon Sep 17 00:00:00 2001 From: Zhixiong Chi -Date: Tue, 28 Mar 2023 06:05:45 +0000 -Subject: [PATCH] Drop ptests fixtures and recorde_modes +Date: Thu, 29 Feb 2024 12:31:58 -0800 +Subject: [PATCH] [PATCH] Drop ptests fixtures and recorde_modes The usage of fixture in test_fixtures has been deprecated. See https://docs.pytest.org/en/stable/explanation/fixtures.html and @@ -12,14 +12,15 @@ re-sold several times, and it adds X-Amzn-Trace-Id header that can possibly diff for each request. It leads to ptest failure, so drop it now until we find the solution. -Upstream-Status: Inappropriate [oe specific] +Upstream-Status: Inappropriate [OE-Specific] Signed-off-by: Zhixiong Chi +Signed-off-by: Khem Raj --- tests/integration/test_fixtures.py | 60 ----------- - tests/integration/test_record_modes.py | 132 ------------------------- - tests/unit/test_fixtures.py | 94 ------------------ - 3 files changed, 286 deletions(-) + tests/integration/test_record_modes.py | 141 ------------------------- + tests/unit/test_fixtures.py | 94 ----------------- + 3 files changed, 295 deletions(-) delete mode 100644 tests/integration/test_fixtures.py delete mode 100644 tests/integration/test_record_modes.py delete mode 100644 tests/unit/test_fixtures.py @@ -92,10 +93,12 @@ index fc3d1e7..0000000 - assert True diff --git a/tests/integration/test_record_modes.py b/tests/integration/test_record_modes.py deleted file mode 100644 -index 58c8846..0000000 +index 988b851..0000000 --- a/tests/integration/test_record_modes.py +++ /dev/null -@@ -1,132 +0,0 @@ +@@ -1,141 +0,0 @@ +-import re +- -from betamax import Betamax, BetamaxError - -from tests.integration.helper import IntegrationHelper @@ -137,8 +140,15 @@ index 58c8846..0000000 - # this test to succeed. - # NOTE(hroncok): httpbin.org added X-Processed-Time header that - # can possibly differ (and often does) +- r0_content = r0.content.decode(encoding='utf-8', errors='strict') +- r1_content = r1.content.decode(encoding='utf-8', errors='strict') +- r0_content = re.sub('"X-Amzn-Trace-Id": "[^"]+"', '"X-Amzn-Trace-Id": ""', r0_content) +- r1_content = re.sub('"X-Amzn-Trace-Id": "[^"]+"', '"X-Amzn-Trace-Id": ""', r1_content) +- # NOTE(jhatler): httpbin.org added "X-Amzn-Trace-Id" to their +- # response, which is a unique ID that will differ between requests. +- # We remove it from the response body before comparing. - assert r0_headers == r1_headers -- assert r0.content == r1.content +- assert r0_content == r1_content - - -class TestRecordNone(IntegrationHelper): @@ -230,7 +240,7 @@ index 58c8846..0000000 - assert len(cassette.interactions) == 5 diff --git a/tests/unit/test_fixtures.py b/tests/unit/test_fixtures.py deleted file mode 100644 -index 387d9ce..0000000 +index 41f33eb..0000000 --- a/tests/unit/test_fixtures.py +++ /dev/null @@ -1,94 +0,0 @@ @@ -263,9 +273,9 @@ index 387d9ce..0000000 - # Mock a pytest request object - request = mock.MagicMock() - request.cls = request.module = None -- request.function.__name__ = 'test' +- request.node.name = request.function.__name__ = 'test' - -- pytest_fixture.betamax_recorder(request) +- pytest_fixture._betamax_recorder(request) - assert request.addfinalizer.called is True - request.addfinalizer.assert_called_once_with(self.mocked_betamax.stop) - @@ -273,9 +283,9 @@ index 387d9ce..0000000 - # Mock a pytest request object - request = mock.MagicMock() - request.cls = request.module = None -- request.function.__name__ = 'test' +- request.node.name = request.function.__name__ = 'test' - -- pytest_fixture.betamax_recorder(request) +- pytest_fixture._betamax_recorder(request) - self.mocked_betamax.start.assert_called_once_with() - - @@ -329,5 +339,5 @@ index 387d9ce..0000000 - - recorder.stop.assert_called_once_with() -- -2.35.5 +2.44.0 -- cgit v1.2.3