From patchwork Tue Aug 21 17:02:46 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 960664 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="UHwMbCpp"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 41vyq60vMgz9s47 for ; Wed, 22 Aug 2018 03:49:20 +1000 (AEST) Received: from localhost ([::1]:55181 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fsAmL-0005bd-PE for incoming@patchwork.ozlabs.org; Tue, 21 Aug 2018 13:49:17 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33980) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fsA4y-0002Sj-5i for qemu-devel@nongnu.org; Tue, 21 Aug 2018 13:04:32 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fsA4u-0007Kb-2Z for qemu-devel@nongnu.org; Tue, 21 Aug 2018 13:04:25 -0400 Received: from mail-wm0-x22f.google.com ([2a00:1450:400c:c09::22f]:51293) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fsA4t-0007If-5q for qemu-devel@nongnu.org; Tue, 21 Aug 2018 13:04:23 -0400 Received: by mail-wm0-x22f.google.com with SMTP id y2-v6so3646092wma.1 for ; Tue, 21 Aug 2018 10:04:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=bNnBuQs6TGjJQ+LFv3wZcL7YDwkpNUcCTKJ2MHRpFe0=; b=UHwMbCpp69rd1HWoa2pMISvxPFT0X1y3Tz+E+HVPeEyvY+KQ5nio9glkPGgZGcjouD Gu3FEjY4IArosNxGQUfGGk3xFWTMl2L+2wqbjgwArqp3xyRPXM8PwmQ4P3rdLokLOur6 3Wo1Wz/N6kypwDR84juVtlkjVbLVCdM5xslGf3ey05pZx9vLcO+6F6lWOT6WgI3cKJ5f SIPthBnt+CoBmFtyJ+QmdJSims6nX+J0z0Qe6aATGA5BdF3oAEfg0kH+GZVU3JIK/1C4 F0eBf6vA8LLa7PQj8dKskFMtoVnPwmr93wjvf5VieBDJTroMRnOF8fd1HE8DUce8Sz6Q f2Fw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=bNnBuQs6TGjJQ+LFv3wZcL7YDwkpNUcCTKJ2MHRpFe0=; b=Df2t7sUJd91vSX/P6QVnM1Mvsr34VlYSgsobxX284a3ECrCA5+JczYhWEr22PokQEh ELCLcvYyXP408pJ76/EjDDomybbY9HHT6JU8wpo1E5/8dSaaTKq/NZ8dbVpIy6HjPJ2G hw3/AulFCt3eVoDSupsF3HZUorhjt7iY79pIFp7JYQKQsC6nrN4qTXr6GV6/rur93Yfc rYgSQmtFv9T6um91VL1kCPrj/iO8MffjmyhfB2BoJCf6VVShcYs0gQec7uBDvZrgBFel 2Ki1UPhjTMuEebdn2s7WzXsN8WesKp7EqNjBFSUXPjZlgWp5/N9zLhkUNdspBuyREASv /U5A== X-Gm-Message-State: APzg51CAulmuRtmU1IuuMbSRwzElJs5DH2bcEEBHRKLSVOKThoKSnO8U n83P07wY8H8GJ0iY1ZlBmnxwUPEt X-Google-Smtp-Source: ANB0Vdbba40wZhZ+ZS+6b6e944VMeCbMDslUBrD+B7qnqj+4GaRxsojFqpjhDlj5Cfj2xiQUe6x/XQ== X-Received: by 2002:a1c:c14:: with SMTP id 20-v6mr131010wmm.117.1534871061767; Tue, 21 Aug 2018 10:04:21 -0700 (PDT) Received: from 640k.lan (dynamic-adsl-78-12-184-244.clienti.tiscali.it. [78.12.184.244]) by smtp.gmail.com with ESMTPSA id v6-v6sm2608955wmc.43.2018.08.21.10.04.20 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 21 Aug 2018 10:04:21 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Tue, 21 Aug 2018 19:02:46 +0200 Message-Id: <1534870966-9287-75-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1534870966-9287-1-git-send-email-pbonzini@redhat.com> References: <1534870966-9287-1-git-send-email-pbonzini@redhat.com> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c09::22f Subject: [Qemu-devel] [PULL 74/74] test-char: add socket reconnect test X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Marc-André Lureau This test exhibits a regression fixed by the previous reverts. Signed-off-by: Marc-André Lureau Message-Id: <20180817135224.22971-5-marcandre.lureau@redhat.com> Signed-off-by: Paolo Bonzini Signed-off-by: Marc-André Lureau --- tests/test-char.c | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/tests/test-char.c b/tests/test-char.c index 2a2ff32..2670ff6 100644 --- a/tests/test-char.c +++ b/tests/test-char.c @@ -307,7 +307,7 @@ static int socket_can_read_hello(void *opaque) return 10; } -static void char_socket_test_common(Chardev *chr) +static void char_socket_test_common(Chardev *chr, bool reconnect) { Chardev *chr_client; QObject *addr; @@ -327,7 +327,8 @@ static void char_socket_test_common(Chardev *chr) addr = object_property_get_qobject(OBJECT(chr), "addr", &error_abort); qdict = qobject_to(QDict, addr); port = qdict_get_str(qdict, "port"); - tmp = g_strdup_printf("tcp:127.0.0.1:%s", port); + tmp = g_strdup_printf("tcp:127.0.0.1:%s%s", port, + reconnect ? ",reconnect=1" : ""); qobject_unref(qdict); qemu_chr_fe_init(&be, chr, &error_abort); @@ -368,7 +369,15 @@ static void char_socket_basic_test(void) { Chardev *chr = qemu_chr_new("server", "tcp:127.0.0.1:0,server,nowait"); - char_socket_test_common(chr); + char_socket_test_common(chr, false); +} + + +static void char_socket_reconnect_test(void) +{ + Chardev *chr = qemu_chr_new("server", "tcp:127.0.0.1:0,server,nowait"); + + char_socket_test_common(chr, true); } @@ -400,7 +409,7 @@ static void char_socket_fdpass_test(void) qemu_opts_del(opts); - char_socket_test_common(chr); + char_socket_test_common(chr, false); } @@ -819,6 +828,7 @@ int main(int argc, char **argv) g_test_add_func("/char/file-fifo", char_file_fifo_test); #endif g_test_add_func("/char/socket/basic", char_socket_basic_test); + g_test_add_func("/char/socket/reconnect", char_socket_reconnect_test); g_test_add_func("/char/socket/fdpass", char_socket_fdpass_test); g_test_add_func("/char/udp", char_udp_test); #ifdef HAVE_CHARDEV_SERIAL