From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41271) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dpA4K-0001GH-14 for qemu-devel@nongnu.org; Tue, 05 Sep 2017 05:22:56 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dpA4F-0002pB-Fh for qemu-devel@nongnu.org; Tue, 05 Sep 2017 05:22:52 -0400 Received: from mx1.redhat.com ([209.132.183.28]:43456) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dpA4F-0002of-AH for qemu-devel@nongnu.org; Tue, 05 Sep 2017 05:22:47 -0400 From: "Daniel P. Berrange" Date: Tue, 5 Sep 2017 10:22:30 +0100 Message-Id: <20170905092230.8243-10-berrange@redhat.com> In-Reply-To: <20170905092230.8243-1-berrange@redhat.com> References: <20170905092230.8243-1-berrange@redhat.com> Subject: [Qemu-devel] [PULL v1 9/9] io: fix check for handshake completion in TLS test List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Peter Maydell , "Daniel P. Berrange" The TLS I/O channel test had mistakenly used && instead of || when checking for handshake completion. As a result it could terminate the handshake process before it had actually completed. This was harmless before but changes in GNUTLS 3.6.0 exposed this bug and caused the test suite to fail. Reviewed-by: Eric Blake Signed-off-by: Daniel P. Berrange --- tests/test-io-channel-tls.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/test-io-channel-tls.c b/tests/test-io-channel-tls.c index ff96877323..a210d01ba5 100644 --- a/tests/test-io-channel-tls.c +++ b/tests/test-io-channel-tls.c @@ -218,7 +218,7 @@ static void test_io_channel_tls(const void *opaque) mainloop = g_main_context_default(); do { g_main_context_iteration(mainloop, TRUE); - } while (!clientHandshake.finished && + } while (!clientHandshake.finished || !serverHandshake.finished); g_assert(clientHandshake.failed == data->expectClientFail); -- 2.13.5