From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50160) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZZQSf-0004B3-Qb for qemu-devel@nongnu.org; Tue, 08 Sep 2015 17:29:54 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZZQSe-0007ai-QG for qemu-devel@nongnu.org; Tue, 08 Sep 2015 17:29:53 -0400 References: <1441047913-30596-1-git-send-email-mreitz@redhat.com> <1441047913-30596-3-git-send-email-mreitz@redhat.com> <55EF5251.90906@redhat.com> From: Max Reitz Message-ID: <55EF5347.8020503@redhat.com> Date: Tue, 8 Sep 2015 23:29:43 +0200 MIME-Version: 1.0 In-Reply-To: <55EF5251.90906@redhat.com> Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="NCGPxWOhnDStRtD4U8B8HcoQMIdfiqahT" Subject: Re: [Qemu-devel] [Qemu-block] [PATCH 2/2] iotests: Warn if python subprocess is killed List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: John Snow , qemu-block@nongnu.org Cc: Kevin Wolf , qemu-devel@nongnu.org This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --NCGPxWOhnDStRtD4U8B8HcoQMIdfiqahT Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: quoted-printable On 08.09.2015 23:25, John Snow wrote: >=20 >=20 > On 08/31/2015 03:05 PM, Max Reitz wrote: >> Currently, if a subprocess of a python test (i.e. qemu-io, qemu-img, o= r >> qemu) receives a signal and is subsequently aborted, this is not logge= d. >> >> This patch makes python tests always check the exit code of these >> subprocesses, and emit a message if they have been killed. >> >> Signed-off-by: Max Reitz >> --- >> tests/qemu-iotests/iotests.py | 26 +++++++++++++++++++++----- >> 1 file changed, 21 insertions(+), 5 deletions(-) >> >> diff --git a/tests/qemu-iotests/iotests.py b/tests/qemu-iotests/iotest= s.py >> index 927c74a..d082597 100644 >> --- a/tests/qemu-iotests/iotests.py >> +++ b/tests/qemu-iotests/iotests.py >> @@ -49,20 +49,34 @@ socket_scm_helper =3D os.environ.get('SOCKET_SCM_H= ELPER', 'socket_scm_helper') >> def qemu_img(*args): >> '''Run qemu-img and return the exit code''' >> devnull =3D open('/dev/null', 'r+') >> - return subprocess.call(qemu_img_args + list(args), stdin=3Ddevnul= l, stdout=3Ddevnull) >> + exitcode =3D subprocess.call(qemu_img_args + list(args), stdin=3D= devnull, stdout=3Ddevnull) >> + if exitcode < 0: >> + sys.stderr.write('qemu-img received signal %i: %s\n' % (-exit= code, ' '.join(qemu_img_args + list(args)))) >> + return exitcode >> =20 >=20 > Why tack on the arguments after the retcode for the print? The format > makes it look like it should be a description for the signal received. qemu_img_args contains the qemu-img filename as well, so it should be obvious that that is the command line. For the "why": I hope it will make debugging easier by providing the exact command line so you can reproduce the problem outside of the test. Max >=20 >> def qemu_img_verbose(*args): >> '''Run qemu-img without suppressing its output and return the exi= t code''' >> - return subprocess.call(qemu_img_args + list(args)) >> + exitcode =3D subprocess.call(qemu_img_args + list(args)) >> + if exitcode < 0: >> + sys.stderr.write('qemu-img received signal %i: %s\n' % (-exit= code, ' '.join(qemu_img_args + list(args)))) >> + return exitcode >> =20 >> def qemu_img_pipe(*args): >> '''Run qemu-img and return its output''' >> - return subprocess.Popen(qemu_img_args + list(args), stdout=3Dsubp= rocess.PIPE).communicate()[0] >> + subp =3D subprocess.Popen(qemu_img_args + list(args), stdout=3Dsu= bprocess.PIPE) >> + exitcode =3D subp.wait() >> + if exitcode < 0: >> + sys.stderr.write('qemu-img received signal %i: %s\n' % (-exit= code, ' '.join(qemu_img_args + list(args)))) >> + return subp.communicate()[0] >> =20 >> def qemu_io(*args): >> '''Run qemu-io and return the stdout data''' >> args =3D qemu_io_args + list(args) >> - return subprocess.Popen(args, stdout=3Dsubprocess.PIPE).communica= te()[0] >> + subp =3D subprocess.Popen(args, stdout=3Dsubprocess.PIPE) >> + exitcode =3D subp.wait() >> + if exitcode < 0: >> + sys.stderr.write('qemu-io received signal %i: %s\n' % (-exitc= ode, ' '.join(args))) >> + return subp.communicate()[0] >> =20 >> def compare_images(img1, img2): >> '''Return True if two image files are identical''' >> @@ -197,7 +211,9 @@ class VM(object): >> '''Terminate the VM and clean up''' >> if not self._popen is None: >> self._qmp.cmd('quit') >> - self._popen.wait() >> + exitcode =3D self._popen.wait() >> + if exitcode < 0: >> + sys.stderr.write('qemu received signal %i: %s\n' % (-= exitcode, ' '.join(self._args))) >> os.remove(self._monitor_path) >> os.remove(self._qtest_path) >> os.remove(self._qemu_log_path) >> --NCGPxWOhnDStRtD4U8B8HcoQMIdfiqahT Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQEcBAEBCAAGBQJV71NHAAoJEDuxQgLoOKyterEH/18GrkBGucAS4w5swEMJGACG C9PErAX/ZFoZFpXETsPSeB0Q3N5jmDaNcSCTqIUaPQF59G4WsvzR54l0vTRsjejS yi4I5tYDehtzYrgedSj+CLzDkgpdUm3PE//XKMWGoFBVPEsbvPOlrzeifbwO5QAh SOK0s+7Sc26+y2KaBlwJeZON+zk7w38++7m3qIZbeQN0fX439d00VbEcw4bZHyfv 9LrG6oPKn0fxQnoj2bw0XKv+uaZRpCBgyMgLhyi7v2a0LfXAal9dYvb3kW2CkOoW +g9YlR9zAONm52KD1yxJkFnSIQuRnYft8YxE4SjFSdD/AYe6cXc2Hz8Ljw2sd74= =hxrd -----END PGP SIGNATURE----- --NCGPxWOhnDStRtD4U8B8HcoQMIdfiqahT--