Message ID | 1538295197-23704-54-git-send-email-pbonzini@redhat.com |
---|---|
State | New |
Headers | show
Return-Path: <qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org> 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=<UNKNOWN>) 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="AX/j6kRc"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 42NKHr5wQ0z9s1x for <incoming@patchwork.ozlabs.org>; Sun, 30 Sep 2018 19:05:12 +1000 (AEST) Received: from localhost ([::1]:54506 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from <qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>) id 1g6Xf4-000107-Gx for incoming@patchwork.ozlabs.org; Sun, 30 Sep 2018 05:05:10 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41721) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from <paolo.bonzini@gmail.com>) id 1g6Ws9-0002zm-QF for qemu-devel@nongnu.org; Sun, 30 Sep 2018 04:14:38 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from <paolo.bonzini@gmail.com>) id 1g6Ws8-0001Dg-8Q for qemu-devel@nongnu.org; Sun, 30 Sep 2018 04:14:37 -0400 Received: from mail-wm1-x335.google.com ([2a00:1450:4864:20::335]:52670) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from <paolo.bonzini@gmail.com>) id 1g6Ws6-00010b-BG for qemu-devel@nongnu.org; Sun, 30 Sep 2018 04:14:35 -0400 Received: by mail-wm1-x335.google.com with SMTP id 189-v6so5492390wmw.2 for <qemu-devel@nongnu.org>; Sun, 30 Sep 2018 01:14:16 -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=AX/j6kRcN1ZtnH95wSnsq/ae57ScDjsS+0A22cFIVUT2RFmzMcmjwkdgP+cIqBy8Yw sTVE7n9Y/mG8t/ss+vxHVCKrLYLaoc+rs4fdM2x7mjm4xgaVBOtuAboYoxxPI9U4wc1w AuyDkLjqF763nRLGyJtycdfQ87OU3o0VryDWQz/X7ja1MaEFw7dwX+z5MmlvQR08m710 S6ONm9C+cYZwLjfRfgjmroHuPb7jr4Va29ifg9bH+JyV8SWrCISr5ZoESet05yBRDMek Y6o5zuG813yy3JD2BsANU7eIefebBs2vxwExqW5ks5i3D54EjItol2HCLVJbT4WNMo91 NBQg== 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=kQ8bdFrnnG0ryPrj+w4KDxf6TR3g2qeyDrwJurw2W2TvQ1x+djBqLvNK52vPd9tkfO qKKbmGdo2OZ0GFsxUdQln/SMfJCeDWnbXRQCHVRcUleKX7rD0rx27z5uRgf/MDdkLqTY 4mHBoFjNNz8HOmwopGm1XLxZX1HE3FkIoX9eJi7hnRlpWdzGmpU5YpK6cZwjPGDvGc/W h+fgaS1tmhHIuvHQK53l7gUyyS2dnnkeaiHWmf501q9AtcEf1kGTnnJ/OSO3YC7kkbA9 dTMS9Vv6Ed/xaT87tbG6VrBctJX8XmJARI7ogUuucZTXS+bxu8eH8Cv1eRjGWAMEh/dJ Pl7g== X-Gm-Message-State: ABuFfogyLHRl1B+2vIP3troAoNK7Gl1zDI7eFdbs/d1q/ZYlvTsOiYbB Q48rv6K+v1AYWuLHZPS+3OC1NS/B X-Google-Smtp-Source: ACcGV63SThLS/rnl2XKMluiMcBDJU7zIAoV9JA55WjwbHz5OxLYxL0Yz5W/h4jGTOmzAtLJZDaHFlg== X-Received: by 2002:a1c:8942:: with SMTP id l63-v6mr6240883wmd.66.1538295254917; Sun, 30 Sep 2018 01:14:14 -0700 (PDT) Received: from 640k.lan (94-36-187-248.adsl-ull.clienti.tiscali.it. [94.36.187.248]) by smtp.gmail.com with ESMTPSA id u76-v6sm11369194wmd.10.2018.09.30.01.14.14 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 30 Sep 2018 01:14:14 -0700 (PDT) From: Paolo Bonzini <pbonzini@redhat.com> To: qemu-devel@nongnu.org Date: Sun, 30 Sep 2018 10:12:51 +0200 Message-Id: <1538295197-23704-54-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1538295197-23704-1-git-send-email-pbonzini@redhat.com> References: <1538295197-23704-1-git-send-email-pbonzini@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::335 Subject: [Qemu-devel] [PULL 53/79] test-char: add socket reconnect test X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: <qemu-devel.nongnu.org> List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>, <mailto:qemu-devel-request@nongnu.org?subject=unsubscribe> List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel/> List-Post: <mailto:qemu-devel@nongnu.org> List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help> List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>, <mailto:qemu-devel-request@nongnu.org?subject=subscribe> Cc: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= <marcandre.lureau@redhat.com> Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" <qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org> |
Series |
[PULL,01/79] virtio: Return true from virtio_queue_empty if broken
|
expand
|
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