mirror of
git://git.openembedded.org/meta-openembedded
synced 2026-09-29 21:24:28 +00:00
sshfs-fuse: Fix ptest builds with python 3.12
Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
parent
c2056112d4
commit
daa0049d23
@ -0,0 +1,34 @@
|
|||||||
|
From 03ee1f8aa0899268ec02b2f54849352df92a3a1d Mon Sep 17 00:00:00 2001
|
||||||
|
From: Gabriel Staples <ercaguy@gmail.com>
|
||||||
|
Date: Tue, 22 Dec 2020 23:33:55 -0800
|
||||||
|
Subject: [PATCH] pytest.ini: fix test warning
|
||||||
|
|
||||||
|
Warning:
|
||||||
|
|
||||||
|
```
|
||||||
|
test/util.py:99
|
||||||
|
sshfs/build/test/util.py:99: PytestUnknownMarkWarning: Unknown pytest.mark.uses_fuse - is this a typo?
|
||||||
|
You can register custom marks to avoid this warning - for details, see https://docs.pytest.org/en/stable/mark.html
|
||||||
|
return pytest.mark.uses_fuse()
|
||||||
|
```
|
||||||
|
|
||||||
|
References for the fix:
|
||||||
|
|
||||||
|
1. https://stackoverflow.com/questions/60806473/pytestunknownmarkwarning-unknown-pytest-mark-xxx-is-this-a-typo/60813297#60813297
|
||||||
|
1. https://docs.pytest.org/en/stable/mark.html
|
||||||
|
|
||||||
|
Upstream-Status: Submitted [https://github.com/libfuse/sshfs/pull/238]
|
||||||
|
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||||
|
---
|
||||||
|
test/pytest.ini | 2 ++
|
||||||
|
1 file changed, 2 insertions(+)
|
||||||
|
|
||||||
|
diff --git a/test/pytest.ini b/test/pytest.ini
|
||||||
|
index 95161546..7a7efed4 100644
|
||||||
|
--- a/test/pytest.ini
|
||||||
|
+++ b/test/pytest.ini
|
||||||
|
@@ -1,2 +1,4 @@
|
||||||
|
[pytest]
|
||||||
|
addopts = --verbose --assert=rewrite --tb=native -x -r a
|
||||||
|
+markers =
|
||||||
|
+ uses_fuse
|
||||||
@ -0,0 +1,31 @@
|
|||||||
|
From a1d58ae1be99571a88b8439b027abe6349b74658 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Gabriel Staples <ercaguy@gmail.com>
|
||||||
|
Date: Tue, 22 Dec 2020 23:26:40 -0800
|
||||||
|
Subject: [PATCH] Fix deprecated warning in conftest.py
|
||||||
|
|
||||||
|
```
|
||||||
|
test/conftest.py:66
|
||||||
|
sshfs/build/test/conftest.py:66: PytestDeprecationWarning: @pytest.yield_fixture is deprecated.
|
||||||
|
Use @pytest.fixture instead; they are the same.
|
||||||
|
@pytest.yield_fixture(autouse=True)
|
||||||
|
```
|
||||||
|
|
||||||
|
Upstream-Status: Submitted [https://github.com/libfuse/sshfs/pull/238]
|
||||||
|
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||||
|
---
|
||||||
|
test/conftest.py | 2 +-
|
||||||
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/test/conftest.py b/test/conftest.py
|
||||||
|
index 70cd0c62..d58d45b2 100644
|
||||||
|
--- a/test/conftest.py
|
||||||
|
+++ b/test/conftest.py
|
||||||
|
@@ -63,7 +63,7 @@ def register_output(self, pattern, count=1, flags=re.MULTILINE):
|
||||||
|
# relies on tests running sequential (i.e., don't dare to use e.g. the xdist
|
||||||
|
# plugin)
|
||||||
|
current_capfd = None
|
||||||
|
-@pytest.yield_fixture(autouse=True)
|
||||||
|
+@pytest.fixture(autouse=True)
|
||||||
|
def save_cap_fixtures(request, capfd):
|
||||||
|
global current_capfd
|
||||||
|
capfd.false_positives = []
|
||||||
@ -5,7 +5,10 @@ LICENSE = "GPL-2.0-only"
|
|||||||
DEPENDS = "glib-2.0 fuse3"
|
DEPENDS = "glib-2.0 fuse3"
|
||||||
LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
|
LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
|
||||||
|
|
||||||
SRC_URI = "git://github.com/libfuse/sshfs;branch=master;protocol=https"
|
SRC_URI = "git://github.com/libfuse/sshfs;branch=master;protocol=https \
|
||||||
|
file://03ee1f8aa0899268ec02b2f54849352df92a3a1d.patch \
|
||||||
|
file://a1d58ae1be99571a88b8439b027abe6349b74658.patch \
|
||||||
|
"
|
||||||
SRCREV = "c91eb9a9a992f1a36c49a8e6f1146e45b5e1c8e7"
|
SRCREV = "c91eb9a9a992f1a36c49a8e6f1146e45b5e1c8e7"
|
||||||
S = "${WORKDIR}/git"
|
S = "${WORKDIR}/git"
|
||||||
|
|
||||||
@ -18,6 +21,7 @@ SRC_URI += " \
|
|||||||
RDEPENDS:${PN}-ptest += " \
|
RDEPENDS:${PN}-ptest += " \
|
||||||
python3-pytest \
|
python3-pytest \
|
||||||
bash \
|
bash \
|
||||||
|
fuse \
|
||||||
"
|
"
|
||||||
|
|
||||||
do_install_ptest() {
|
do_install_ptest() {
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user