Move towards a consistent interface across OETarget subclasses by
moving server_ip to the superclass.
Signed-off-by: Ross Burton <ross.bur...@arm.com>
---
meta/lib/oeqa/core/target/__init__.py | 3 ++-
meta/lib/oeqa/core/target/qemu.py | 4 +---
meta/lib/oeqa/core/target/ssh.py | 3 +--
3 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/meta/lib/oeqa/core/target/__init__.py
b/meta/lib/oeqa/core/target/__init__.py
index 3da66038342..aff02ecc439 100644
--- a/meta/lib/oeqa/core/target/__init__.py
+++ b/meta/lib/oeqa/core/target/__init__.py
@@ -7,7 +7,8 @@
class OETarget:
- def __init__(self, logger, *args, **kwargs):
+ def __init__(self, logger, server_ip):
+ self.server_ip = server_ip
self.logger = logger
def start(self):
diff --git a/meta/lib/oeqa/core/target/qemu.py
b/meta/lib/oeqa/core/target/qemu.py
index 79fd724f7d4..7c6e353edf2 100644
--- a/meta/lib/oeqa/core/target/qemu.py
+++ b/meta/lib/oeqa/core/target/qemu.py
@@ -26,10 +26,8 @@ class OEQemuTarget(OESSHTarget):
tmpdir='', dir_image='', boottime=60, serial_ports=2,
boot_patterns = defaultdict(str), ovmf=False, tmpfsdir=None,
**kwargs):
- super(OEQemuTarget, self).__init__(logger, None, server_ip, timeout,
- user, port)
+ super().__init__(logger, None, server_ip, timeout, user, port)
- self.server_ip = server_ip
self.server_port = 0
self.machine = machine
self.rootfs = rootfs
diff --git a/meta/lib/oeqa/core/target/ssh.py b/meta/lib/oeqa/core/target/ssh.py
index 923a223b25b..4da1e4c2b2d 100644
--- a/meta/lib/oeqa/core/target/ssh.py
+++ b/meta/lib/oeqa/core/target/ssh.py
@@ -27,9 +27,8 @@ class OESSHTarget(OETarget):
fileHandler.setFormatter(formatter)
logger.addHandler(fileHandler)
- super(OESSHTarget, self).__init__(logger)
+ super().__init__(logger, server_ip)
self.ip = ip
- self.server_ip = server_ip
self.server_port = server_port
self.timeout = timeout
self.user = user
--
2.25.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#155907):
https://lists.openembedded.org/g/openembedded-core/message/155907
Mute This Topic: https://lists.openembedded.org/mt/85506111/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
