diff options
Diffstat (limited to 'meta-filesystems/recipes-filesystems/sshfs-fuse/sshfs-fuse')
2 files changed, 65 insertions, 0 deletions
diff --git a/meta-filesystems/recipes-filesystems/sshfs-fuse/sshfs-fuse/03ee1f8aa0899268ec02b2f54849352df92a3a1d.patch b/meta-filesystems/recipes-filesystems/sshfs-fuse/sshfs-fuse/03ee1f8aa0899268ec02b2f54849352df92a3a1d.patch new file mode 100644 index 0000000000..63cdc57b44 --- /dev/null +++ b/meta-filesystems/recipes-filesystems/sshfs-fuse/sshfs-fuse/03ee1f8aa0899268ec02b2f54849352df92a3a1d.patch @@ -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 diff --git a/meta-filesystems/recipes-filesystems/sshfs-fuse/sshfs-fuse/a1d58ae1be99571a88b8439b027abe6349b74658.patch b/meta-filesystems/recipes-filesystems/sshfs-fuse/sshfs-fuse/a1d58ae1be99571a88b8439b027abe6349b74658.patch new file mode 100644 index 0000000000..e76dbd5059 --- /dev/null +++ b/meta-filesystems/recipes-filesystems/sshfs-fuse/sshfs-fuse/a1d58ae1be99571a88b8439b027abe6349b74658.patch @@ -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 = [] |