From d9123d09f711bf1b855de2b5a907d4c85f46d6c3 Mon Sep 17 00:00:00 2001 From: Peter Maydell Date: Fri, 31 Mar 2017 13:36:41 +0100 Subject: [PATCH] tests/libqtest.c: Delete possible stale unix sockets MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Occasionally if a test crashes or is interrupted by the user at the wrong moment it could leave behind a stale UNIX socket in /tmp/. This will then cause a subsequent test run to fail spuriously with tests/libqtest.c:70:init_socket: assertion failed (ret != -1): (-1 != -1) if it happens to reuse the same PID. Defend against this by deleting any stray stale socket before trying to open the new ones for this test. Signed-off-by: Peter Maydell Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Eric Blake Reviewed-by: Stefan Hajnoczi Message-id: 1490963801-27870-1-git-send-email-peter.maydell@linaro.org --- tests/libqtest.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/tests/libqtest.c b/tests/libqtest.c index a5c3d2bf48..99b1195355 100644 --- a/tests/libqtest.c +++ b/tests/libqtest.c @@ -167,6 +167,14 @@ QTestState *qtest_init_without_qmp_handshake(const char *extra_args) socket_path = g_strdup_printf("/tmp/qtest-%d.sock", getpid()); qmp_socket_path = g_strdup_printf("/tmp/qtest-%d.qmp", getpid()); + /* It's possible that if an earlier test run crashed it might + * have left a stale unix socket lying around. Delete any + * stale old socket to avoid spurious test failures with + * tests/libqtest.c:70:init_socket: assertion failed (ret != -1): (-1 != -1) + */ + unlink(socket_path); + unlink(qmp_socket_path); + sock = init_socket(socket_path); qmpsock = init_socket(qmp_socket_path); -- 2.11.4.GIT