From: Jose Quaresma <quaresma.jose@gmail.com>
Date: Wed, 17 Jul 2024 12:34:22 +0000 (+0100)
Subject: oeqa/runtime/scp: requires openssh-sftp-server
X-Git-Tag: yocto-5.2~2317
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2f43da91ba20d18bc419bca7651bb383a51f20af;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git

oeqa/runtime/scp: requires openssh-sftp-server

The SCP protocol was deprecated in favor of the SFTP.
For the legacy SCP protocol scp should be run with "-O".
Instead of adding "-O" on the scp_options ssh oeqa we can
require the openssh-sftp-server to be instaled on the target.

This way the test will work more deterministic regardless of
the host machine client used.
For the old fashion clients still using legacy SCP protocol
the openssh-sshd server will be used, for the new ones using
the SFTP the openssh-sftp-server will be picked.

Signed-off-by: Jose Quaresma <jose.quaresma@foundries.io>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
---

diff --git a/meta/lib/oeqa/runtime/cases/scp.py b/meta/lib/oeqa/runtime/cases/scp.py
index ee97b8ef66c..364264369a3 100644
--- a/meta/lib/oeqa/runtime/cases/scp.py
+++ b/meta/lib/oeqa/runtime/cases/scp.py
@@ -25,7 +25,7 @@ class ScpTest(OERuntimeTestCase):
         os.remove(cls.tmp_path)
 
     @OETestDepends(['ssh.SSHTest.test_ssh'])
-    @OEHasPackage(['openssh-scp'])
+    @OEHasPackage({'openssh-scp', 'openssh-sftp-server'})
     def test_scp_file(self):
         dst = '/tmp/test_scp_file'