[PATCH v2 22/32] iotests: connect stdin to /dev/null when running tests

From: "Alex Bennée" <alex.bennee@linaro.org>
To: qemu-devel@nongnu.org
Cc: "Akihiko Odaki" <akihiko.odaki@gmail.com>,
	"Marc-André Lureau" <marcandre.lureau@redhat.com>,
	qemu-riscv@nongnu.org, "Riku Voipio" <riku.voipio@iki.fi>,
	"Igor Mammedov" <imammedo@redhat.com>,
	"Xiao Guangrong" <xiaoguangrong.eric@gmail.com>,
	"Thomas Huth" <thuth@redhat.com>,
	"Wainer dos Santos Moschetta" <wainersm@redhat.com>,
	"Dr. David Alan Gilbert" <dgilbert@redhat.com>,
	"Alex Williamson" <alex.williamson@redhat.com>,
	"Hao Wu" <wuhaotsh@google.com>, "Cleber Rosa" <crosa@redhat.com>,
	"Daniel Henrique Barboza" <danielhb413@gmail.com>,
	"Jan Kiszka" <jan.kiszka@web.de>,
	"Aurelien Jarno" <aurelien@aurel32.net>,
	qemu-arm@nongnu.org, "Marcelo Tosatti" <mtosatti@redhat.com>,
	"Eduardo Habkost" <eduardo@habkost.net>,
	"Alexandre Iooss" <erdnaxe@crans.org>,
	"Gerd Hoffmann" <kraxel@redhat.com>,
	"Palmer Dabbelt" <palmer@dabbelt.com>,
	"Ilya Leoshkevich" <iii@linux.ibm.com>,
	qemu-ppc@nongnu.org, "Juan Quintela" <quintela@redhat.com>,
	"Cédric Le Goater" <clg@kaod.org>,
	"Darren Kenny" <darren.kenny@oracle.com>,
	kvm@vger.kernel.org,
	"Marcel Apfelbaum" <marcel.apfelbaum@gmail.com>,
	"Peter Maydell" <peter.maydell@linaro.org>,
	"Richard Henderson" <richard.henderson@linaro.org>,
	"Stafford Horne" <shorne@gmail.com>,
	"Weiwei Li" <liweiwei@iscas.ac.cn>,
	"Sunil V L" <sunilvl@ventanamicro.com>,
	"Stefan Hajnoczi" <stefanha@redhat.com>,
	"Thomas Huth" <huth@tuxfamily.org>,
	"Vijai Kumar K" <vijai@behindbytes.com>,
	"Liu Zhiwei" <zhiwei_liu@linux.alibaba.com>,
	"David Gibson" <david@gibson.dropbear.id.au>,
	"Song Gao" <gaosong@loongson.cn>,
	"Paolo Bonzini" <pbonzini@redhat.com>,
	"Michael S. Tsirkin" <mst@redhat.com>,
	"Niek Linnenbank" <nieklinnenbank@gmail.com>,
	"Greg Kurz" <groug@kaod.org>,
	"Laurent Vivier" <laurent@vivier.eu>,
	"Qiuhao Li" <Qiuhao.Li@outlook.com>,
	"Philippe Mathieu-Daudé" <philmd@linaro.org>,
	"Xiaojuan Yang" <yangxiaojuan@loongson.cn>,
	"Mahmoud Mandour" <ma.mandourr@gmail.com>,
	"Alexander Bulekov" <alxndr@bu.edu>,
	"Jiaxun Yang" <jiaxun.yang@flygoat.com>,
	qemu-block@nongnu.org, "Yanan Wang" <wangyanan55@huawei.com>,
	"David Woodhouse" <dwmw2@infradead.org>,
	qemu-s390x@nongnu.org,
	"Strahinja Jankovic" <strahinja.p.jankovic@gmail.com>,
	"Bandan Das" <bsd@redhat.com>,
	"Alistair Francis" <Alistair.Francis@wdc.com>,
	"Aleksandar Rikalo" <aleksandar.rikalo@syrmia.com>,
	"Tyrone Ting" <kfting@nuvoton.com>,
	"Kevin Wolf" <kwolf@redhat.com>,
	"David Hildenbrand" <david@redhat.com>,
	"Beraldo Leal" <bleal@redhat.com>,
	"Beniamino Galvani" <b.galvani@gmail.com>,
	"Paul Durrant" <paul@xen.org>,
	"Bin Meng" <bin.meng@windriver.com>,
	"Sunil Muthuswamy" <sunilmut@microsoft.com>,
	"Hanna Reitz" <hreitz@redhat.com>, "Peter Xu" <peterx@redhat.com>,
	"Alex Bennée" <alex.bennee@linaro.org>,
	"Daniel P. Berrangé" <berrange@redhat.com>
Subject: [PATCH v2 22/32] iotests: connect stdin to /dev/null when running tests
Date: Wed, 15 Mar 2023 17:43:21 +0000	[thread overview]
Message-ID: <20230315174331.2959-23-alex.bennee@linaro.org> (raw)
In-Reply-To: <20230315174331.2959-1-alex.bennee@linaro.org>

From: Daniel P. Berrangé <berrange@redhat.com>

Currently the tests have their stdin inherited from the test harness,
meaning they are connected to a TTY. The QEMU processes spawned by
certain tests, however, modify TTY settings and if the test exits
abnormally the settings might not be restored.

The python test harness thus has some logic which will capture the
initial TTY settings and restore them once all tests are finished.

This does not, however, take into account the possibility of many
copies of the 'check' program running in parallel. With parallel
execution, a later invokation may save the TTY state that QEMU has
already modified, and thus restore bad state leaving the TTY
non-functional.

None of the I/O tests shnould actually be interactive requiring
user input and so they should not require a TTY at all. To avoid
this while TTY save/restore complexity we can connect the test
stdin to /dev/null instead.

Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Acked-by: Hanna Czenczek <hreitz@redhat.com>
Tested-by: Thomas Huth <thuth@redhat.com>
Message-Id: <20230303160727.3977246-6-berrange@redhat.com>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
---
 tests/qemu-iotests/testrunner.py | 22 ++--------------------
 1 file changed, 2 insertions(+), 20 deletions(-)

diff --git a/tests/qemu-iotests/testrunner.py b/tests/qemu-iotests/testrunner.py
index e734800b3d..81519ed6e2 100644
--- a/tests/qemu-iotests/testrunner.py
+++ b/tests/qemu-iotests/testrunner.py
@@ -24,12 +24,10 @@
 import subprocess
 import contextlib
 import json
-import termios
 import shutil
 import sys
 from multiprocessing import Pool
-from contextlib import contextmanager
-from typing import List, Optional, Iterator, Any, Sequence, Dict, \
+from typing import List, Optional, Any, Sequence, Dict, \
         ContextManager
 
 from testenv import TestEnv
@@ -56,22 +54,6 @@ def file_diff(file1: str, file2: str) -> List[str]:
         return res
 
 
-# We want to save current tty settings during test run,
-# since an aborting qemu call may leave things screwed up.
-@contextmanager
-def savetty() -> Iterator[None]:
-    isterm = sys.stdin.isatty()
-    if isterm:
-        fd = sys.stdin.fileno()
-        attr = termios.tcgetattr(fd)
-
-    try:
-        yield
-    finally:
-        if isterm:
-            termios.tcsetattr(fd, termios.TCSADRAIN, attr)
-
-
 class LastElapsedTime(ContextManager['LastElapsedTime']):
     """ Cache for elapsed time for tests, to show it during new test run
 
@@ -169,7 +151,6 @@ def __enter__(self) -> 'TestRunner':
         self._stack = contextlib.ExitStack()
         self._stack.enter_context(self.env)
         self._stack.enter_context(self.last_elapsed)
-        self._stack.enter_context(savetty())
         return self
 
     def __exit__(self, exc_type: Any, exc_value: Any, traceback: Any) -> None:
@@ -294,6 +275,7 @@ def do_run_test(self, test: str, mp: bool) -> TestResult:
         t0 = time.time()
         with f_bad.open('w', encoding="utf-8") as f:
             with subprocess.Popen(args, cwd=str(f_test.parent), env=env,
+                                  stdin=subprocess.DEVNULL,
                                   stdout=f, stderr=subprocess.STDOUT) as proc:
                 try:
                     proc.wait()
-- 
2.39.2

