From: Peter Marko <[email protected]> This is a global function and thus does not have self object. Executing it leads to "NameError: name 'self' is not defined".
Change it to take parent object which contains all data which is needed to execute it. Signed-off-by: Peter Marko <[email protected]> --- meta/lib/oeqa/runtime/case.py | 14 +++++++------- meta/lib/oeqa/runtime/cases/ping.py | 2 +- meta/lib/oeqa/runtime/cases/ssh.py | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/meta/lib/oeqa/runtime/case.py b/meta/lib/oeqa/runtime/case.py index 2a47771a3d..095bcf434a 100644 --- a/meta/lib/oeqa/runtime/case.py +++ b/meta/lib/oeqa/runtime/case.py @@ -22,15 +22,15 @@ class OERuntimeTestCase(OETestCase): super(OERuntimeTestCase, self).tearDown() uninstall_package(self) -def run_network_serialdebug(runner): - if not runner: +def run_network_serialdebug(target): + if not target.runner: return - status, output = runner.run_serial("ip addr") + status, output = target.runner.run_serial("ip addr") print("ip addr on target: %s %s" % (output, status)) - status, output = runner.run_serial("ping -c 1 %s" % self.target.server_ip) - print("ping on target for %s: %s %s" % (self.target.server_ip, output, status)) - status, output = runner.run_serial("ping -c 1 %s" % self.target.ip) - print("ping on target for %s: %s %s" % (self.target.ip, output, status)) + status, output = target.runner.run_serial("ping -c 1 %s" % target.server_ip) + print("ping on target for %s: %s %s" % (target.server_ip, output, status)) + status, output = target.runner.run_serial("ping -c 1 %s" % target.ip) + print("ping on target for %s: %s %s" % (target.ip, output, status)) # Have to use a full path for netstat which isn't in HOSTTOOLS subprocess.call(["/usr/bin/netstat", "-tunape"]) subprocess.call(["/usr/bin/netstat", "-ei"]) diff --git a/meta/lib/oeqa/runtime/cases/ping.py b/meta/lib/oeqa/runtime/cases/ping.py index efb91d4cc9..baea1b385b 100644 --- a/meta/lib/oeqa/runtime/cases/ping.py +++ b/meta/lib/oeqa/runtime/cases/ping.py @@ -36,7 +36,7 @@ class PingTest(OERuntimeTestCase): count = 0 sleep(1) except OEQATimeoutError: - run_network_serialdebug(self.target.runner) + run_network_serialdebug(self.target) self.fail("Ping timeout error for address %s, count %s, output: %s" % (self.target.ip, count, output)) msg = ('Expected 5 consecutive, got %d.\n' 'ping output is:\n%s' % (count,output)) diff --git a/meta/lib/oeqa/runtime/cases/ssh.py b/meta/lib/oeqa/runtime/cases/ssh.py index 3e9503277e..5fa4bb98b5 100644 --- a/meta/lib/oeqa/runtime/cases/ssh.py +++ b/meta/lib/oeqa/runtime/cases/ssh.py @@ -32,7 +32,7 @@ class SSHTest(OERuntimeTestCase): time.sleep(5) continue else: - run_network_serialdebug(self.target.runner) + run_network_serialdebug(self.target) self.fail("uname failed with \"%s\" (exit code %s)" % (output, status)) if status != 0: self.fail("ssh failed with \"%s\" (exit code %s)" % (output, status))
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#229233): https://lists.openembedded.org/g/openembedded-core/message/229233 Mute This Topic: https://lists.openembedded.org/mt/117240490/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
