From: André Draszik Date: Thu, 12 Dec 2019 21:52:11 +0000 (+0000) Subject: oeqa/target/ssh oeqa/target/qemu: expose server listening port to tests X-Git-Tag: lucaceresoli/bug-15201-perf-libtraceevent-missing~12493 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ca58559fc30842c123907fb5cc68b3356c530862;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git oeqa/target/ssh oeqa/target/qemu: expose server listening port to tests Allow tests to access the listening port as just introduced. Note that when using qemu this infrastructure shouldn't be needed, but we still need to set the port to 0 so that a listening port is determined automatically (e.g. by the python http server). Signed-off-by: André Draszik Signed-off-by: Richard Purdie --- diff --git a/meta/lib/oeqa/core/target/qemu.py b/meta/lib/oeqa/core/target/qemu.py index 081c627b017..758703c0d12 100644 --- a/meta/lib/oeqa/core/target/qemu.py +++ b/meta/lib/oeqa/core/target/qemu.py @@ -24,6 +24,7 @@ class OEQemuTarget(OESSHTarget): user, port) self.server_ip = server_ip + self.server_port = 0 self.machine = machine self.rootfs = rootfs self.kernel = kernel diff --git a/meta/lib/oeqa/core/target/ssh.py b/meta/lib/oeqa/core/target/ssh.py index 51032ef1a9b..63fc9468b34 100644 --- a/meta/lib/oeqa/core/target/ssh.py +++ b/meta/lib/oeqa/core/target/ssh.py @@ -15,7 +15,7 @@ from . import OETarget class OESSHTarget(OETarget): def __init__(self, logger, ip, server_ip, timeout=300, user='root', - port=None, **kwargs): + port=None, server_port=0, **kwargs): if not logger: logger = logging.getLogger('target') logger.setLevel(logging.INFO) @@ -30,6 +30,7 @@ class OESSHTarget(OETarget): super(OESSHTarget, self).__init__(logger) self.ip = ip self.server_ip = server_ip + self.server_port = server_port self.timeout = timeout self.user = user ssh_options = [