diff mbox series

[21/41] oeqa/core/target/ssh: Fix TimeoutExpired reference

Message ID	20261115084845.701136-21-richard.purdie@linuxfoundation.org
State	New
Headers	show Received: from mail-wr1-f47.google.com (mail-wr1-f47.google.com [209.85.221.47]) by mx.groups.io with SMTP id smtpd.msgproc01-g2.4330.1794732563917779030 for <openembedded-core@lists.openembedded.org>; Sun, 15 Nov 2026 00:49:24 -0800 ip: 209.85.221.47, mailfrom: richard.purdie@linuxfoundation.org) From: Richard Purdie <richard.purdie@linuxfoundation.org> To: openembedded-core@lists.openembedded.org Subject: [PATCH 21/41] oeqa/core/target/ssh: Fix TimeoutExpired reference Date: Sun, 15 Nov 2026 08:48:24 +0000 Message-ID: <20261115084845.701136-21-richard.purdie@linuxfoundation.org> In-Reply-To: <20261115084845.701136-1-richard.purdie@linuxfoundation.org> References: <20261115084845.701136-1-richard.purdie@linuxfoundation.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="utf-8"
Series	[01/41] oeqa/loader: Drop code for pre python 3.5 \| expand [01/41] oeqa/loader: Drop code for pre python 3.5 [02/41] lib: Simplify super() calls [03/41] oe-buildenv-internal: Correct minimum python version [04/41] oeqa/core/utils/concurrencytest: Fix losing results after class setup failures [05/41] oeqa/core/utils/concurrencytest: Only show each test's own output [06/41] oeqa/core/utils/concurrencytest: Don't buffer output in the forwarding results [07/41] oeqa/core/utils/concurrencytest: Fix the failed count in the test progress [08/41] oeqa: Drop explicit 'object' base classes [09/41] oeqa: Use OSError instead of IOError and socket.error [10/41] oeqa: Use 'is None' for None comparisons [11/41] oeqa: Drop redundant .keys() calls on dicts [12/41] oeqa/core/context: Use isinstance() for type check [13/41] oeqa: Use bare raise to re-raise exceptions [14/41] oeqa: Let subprocess decode output instead of calling .decode() [15/41] oeqa/selftest/manifest: Remove broken/unused code [16/41] oeqa/utils/testexport.py: Drop file [17/41] oeqa/runexported.py: Remove file [18/41] oeqa/oetest.py: Remove [19/41] oeqa/lib/utils/decorators.py: Remove [20/41] oeqa/targetcontrol: Drop SimpleRemoteTarget [21/41] oeqa/core/target/ssh: Fix TimeoutExpired reference [22/41] oeqa/runtime/ltp: Share a single base class and fix tearDownClass failures [23/41] oeqa/selftest/oelib/buildhistory: Fix variable removal in commit_vars() [24/41] oeqa: Remove unused code [25/41] oeqa/core/loader: Simplify the _make_failed_test override [26/41] oeqa: Remove unused imports [27/41] oeqa/core/decorator/depends: Check resolved dependency ids when running [28/41] oeqa/core/case: Tear down decorators if setUp() fails [29/41] oeqa/core/loader: Bind a copy of each decorator per test case [30/41] oeqa/core/runner: Report the status of tests with failing subtests [31/41] oeqa/buildperf: Drop sortTestMethodsUsing from the test runner [32/41] oeqa/core/tests: Add tests for the reported test result status [33/41] oeqa/core/runner: Track test results as they are added [34/41] oeqa/core/runner: Use getSuiteCases() to list tests [35/41] oeqa/core/decorator: Record decorators on the test function [36/41] oeqa/core/tests: Add tests for skipping tests and td_vars checks [37/41] oeqa/core: Use unittest's setup hook instead of patching test classes [38/41] oeqa/core/loader: Always return a flat test suite [39/41] oeqa: Drop the unused tc_kwargs list phase and dead selftest code [40/41] oeqa: Replace tc_kwargs with explicit attributes [41/41] oeqa/selftest: Use the core executor's run()

Commit Message

Richard Purdie Nov. 15, 2026, 8:48 a.m. UTC

TimeoutExpired was never imported so if the ssh process failed to exit
after 5 seconds, the cleanup code raised a NameError instead of
killing the process.

AI-Generated: Uses Claude Opus 5.5
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
 meta/lib/oeqa/core/target/ssh.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff mbox series

Patch

diff --git a/meta/lib/oeqa/core/target/ssh.py b/meta/lib/oeqa/core/target/ssh.py
index e380fd84854..03e99e68234 100644
--- a/meta/lib/oeqa/core/target/ssh.py
+++ b/meta/lib/oeqa/core/target/ssh.py
@@ -296,7 +296,7 @@  def SSHCall(command, logger, timeout=None, raw=False, **opts):
         if process.returncode is None:
             try:
                 process.wait(timeout=5)
-            except TimeoutExpired:
+            except subprocess.TimeoutExpired:
                 try:
                     process.kill()
                 except OSError: