diff options
author | André Draszik <git@andred.net> | 2019-12-12 21:52:11 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-12-16 23:25:49 +0000 |
commit | eeefadc738790975cd8d8c3613a2a285f33751e8 (patch) | |
tree | 3c2aeabde223a850283edd4bb2610642f0821ac8 /meta | |
parent | ae6c729a53111b6477903f429efd5a58e3f2b575 (diff) | |
download | poky-eeefadc738790975cd8d8c3613a2a285f33751e8.tar.gz |
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).
(From OE-Core rev: ca58559fc30842c123907fb5cc68b3356c530862)
Signed-off-by: André Draszik <git@andred.net>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/lib/oeqa/core/target/qemu.py | 1 | ||||
-rw-r--r-- | meta/lib/oeqa/core/target/ssh.py | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/meta/lib/oeqa/core/target/qemu.py b/meta/lib/oeqa/core/target/qemu.py index 081c627b01..758703c0d1 100644 --- a/meta/lib/oeqa/core/target/qemu.py +++ b/meta/lib/oeqa/core/target/qemu.py | |||
@@ -24,6 +24,7 @@ class OEQemuTarget(OESSHTarget): | |||
24 | user, port) | 24 | user, port) |
25 | 25 | ||
26 | self.server_ip = server_ip | 26 | self.server_ip = server_ip |
27 | self.server_port = 0 | ||
27 | self.machine = machine | 28 | self.machine = machine |
28 | self.rootfs = rootfs | 29 | self.rootfs = rootfs |
29 | self.kernel = kernel | 30 | self.kernel = kernel |
diff --git a/meta/lib/oeqa/core/target/ssh.py b/meta/lib/oeqa/core/target/ssh.py index 51032ef1a9..63fc9468b3 100644 --- a/meta/lib/oeqa/core/target/ssh.py +++ b/meta/lib/oeqa/core/target/ssh.py | |||
@@ -15,7 +15,7 @@ from . import OETarget | |||
15 | 15 | ||
16 | class OESSHTarget(OETarget): | 16 | class OESSHTarget(OETarget): |
17 | def __init__(self, logger, ip, server_ip, timeout=300, user='root', | 17 | def __init__(self, logger, ip, server_ip, timeout=300, user='root', |
18 | port=None, **kwargs): | 18 | port=None, server_port=0, **kwargs): |
19 | if not logger: | 19 | if not logger: |
20 | logger = logging.getLogger('target') | 20 | logger = logging.getLogger('target') |
21 | logger.setLevel(logging.INFO) | 21 | logger.setLevel(logging.INFO) |
@@ -30,6 +30,7 @@ class OESSHTarget(OETarget): | |||
30 | super(OESSHTarget, self).__init__(logger) | 30 | super(OESSHTarget, self).__init__(logger) |
31 | self.ip = ip | 31 | self.ip = ip |
32 | self.server_ip = server_ip | 32 | self.server_ip = server_ip |
33 | self.server_port = server_port | ||
33 | self.timeout = timeout | 34 | self.timeout = timeout |
34 | self.user = user | 35 | self.user = user |
35 | ssh_options = [ | 36 | ssh_options = [ |