diff mbox series

[40/42] test: Try to shut down the lab console gracefully

Message ID	20240611200156.2245525-41-sjg@chromium.org
State	Changes Requested
Delegated to:	Tom Rini
Headers	show Return-Path: <u-boot-bounces@lists.denx.de> From: Simon Glass <sjg@chromium.org> To: U-Boot Mailing List <u-boot@lists.denx.de> Cc: Tom Rini <trini@konsulko.com>, Simon Glass <sjg@chromium.org> Subject: [PATCH 40/42] test: Try to shut down the lab console gracefully Date: Tue, 11 Jun 2024 14:01:54 -0600 Message-Id: <20240611200156.2245525-41-sjg@chromium.org> In-Reply-To: <20240611200156.2245525-1-sjg@chromium.org> References: <20240611200156.2245525-1-sjg@chromium.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: list Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" <u-boot-bounces@lists.denx.de>
Series	labgrid: Provide an integration with Labgrid \| expand [00/42] labgrid: Provide an integration with Labgrid [01/42] trace: Update test to tolerate different trace-cmd version [02/42] binman: efi: Correct entry docs [03/42] binman: Regenerate nxp docs [04/42] binman: ti: Regenerate entry docs [05/42] binman: Update the entrydocs header [06/42] buildman: Make mrproper an argument to _reconfigure() [07/42] buildman: Make mrproper an argument to _config_and_build() [08/42] buildman: Make mrproper an argument to run_commit() [09/42] buildman: Avoid rebuilding when --mrproper is used [10/42] buildman: Add a flag to force mrproper on failure [11/42] buildman: Retry the build for current source [12/42] buildman: Add a way to limit the number of buildmans [13/42] dm: core: Enhance comments on bind_drivers_pass() [14/42] initcall: Correct use of relocation offset [15/42] am33xx: Provide a function to set up the debug UART [16/42] sunxi: Mark scp as optional [17/42] google: Disable TPMv2 on most Chromebooks [18/42] meson: Correct driver declaration for meson_axg_gpio [19/42] test: Allow signaling that U-Boot is ready [20/42] test: Make bootstd init run only on sandbox [21/42] test: Use a constant for the test timeout [22/42] test: Pass stderr to stdout [23/42] test: Release board after tests complete [24/42] log: Allow tests to pass with CONFIG_LOGF_FUNC_PAD set [25/42] test: Allow connecting to a running board [26/42] test: Decode exceptions only with sandbox [27/42] test: Avoid failing skipped tests [28/42] test: dm: Show failing driver name [29/42] test: Check help output [30/42] test: Create a common function to get the config [31/42] test: Introduce the concept of a role [32/42] test: Move the receive code into a function [33/42] test: Separate out the exception handling [34/42] test: Detect dead connections [35/42] test: Tidy up remaining exceptions [36/42] test: Introduce lab mode [37/42] test: Improve handling of sending commands [38/42] test: Fix mulptiplex_log typo [39/42] test: Avoid double echo when starting up [40/42] test: Try to shut down the lab console gracefully [41/42] test: Add a section for closing the connection [42/42] CI: Allow running tests on sjg lab

Commit Message

Simon Glass June 11, 2024, 8:01 p.m. UTC

Send the Labgrid quit characters to ask it to exit gracefully. This
typically allows it to power off the board being used.

If that doesn't work, try the less graceful approach.

Signed-off-by: Simon Glass <sjg@chromium.org>
---

 test/py/u_boot_spawn.py | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff mbox series

Patch

diff --git a/test/py/u_boot_spawn.py b/test/py/u_boot_spawn.py
index 261bdf62e15..000e2a364e4 100644
--- a/test/py/u_boot_spawn.py
+++ b/test/py/u_boot_spawn.py
@@ -16,6 +16,9 @@  import termios
 import time
 import traceback
 
+# Character to send (twice) to exit the terminal
+EXIT_CHAR = 0x1d    # FS (Ctrl + ])
+
 class Timeout(Exception):
     """An exception sub-class that indicates that a timeout occurred."""
 
@@ -301,15 +304,25 @@  class Spawn:
             None.
 
         Returns:
-            Nothing.
+            str: Type of closure completed
         """
+        self.send(chr(EXIT_CHAR) * 2)
 
+        # Wait about 10 seconds for Labgrid to close and power off the board
+        for _ in range(100):
+            if not self.isalive():
+                return 'normal'
+            time.sleep(0.1)
+
+        # That didn't work, so try closing the PTY
         os.close(self.fd)
         for _ in range(100):
             if not self.isalive():
-                break
+                return 'break'
             time.sleep(0.1)
 
+        return 'timeout'
+
     def get_expect_output(self):
         """Return the output read by expect()