From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49817) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bzVb0-0003td-1H for qemu-devel@nongnu.org; Wed, 26 Oct 2016 17:18:51 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bzVaz-0006og-12 for qemu-devel@nongnu.org; Wed, 26 Oct 2016 17:18:50 -0400 Received: from relay4-d.mail.gandi.net ([2001:4b98:c:538::196]:59042) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1bzVay-0006oF-Rd for qemu-devel@nongnu.org; Wed, 26 Oct 2016 17:18:48 -0400 From: Eric Blake Date: Wed, 26 Oct 2016 16:18:36 -0500 Message-Id: <1477516718-15439-1-git-send-email-eblake@redhat.com> In-Reply-To: <1477516358-15039-1-git-send-email-eblake@redhat.com> References: <1477516358-15039-1-git-send-email-eblake@redhat.com> Subject: [Qemu-devel] [PATCH v2 1/3] tests: Simplify expected error checking for qmp output List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: armbru@redhat.com, ptoscano@redhat.com, Michael Roth Minor test cleanup noticed while writing a new test. Signed-off-by: Eric Blake Reviewed-by: Markus Armbruster --- tests/test-qobject-output-visitor.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/tests/test-qobject-output-visitor.c b/tests/test-qobject-output-visitor.c index 4e2d79c..c2e0f43 100644 --- a/tests/test-qobject-output-visitor.c +++ b/tests/test-qobject-output-visitor.c @@ -141,13 +141,11 @@ static void test_visitor_out_enum_errors(TestOutputVisitorData *data, const void *unused) { EnumOne i, bad_values[] = { ENUM_ONE__MAX, -1 }; - Error *err; + Error *err = NULL; for (i = 0; i < ARRAY_SIZE(bad_values) ; i++) { - err = NULL; visit_type_EnumOne(data->ov, "unused", &bad_values[i], &err); - g_assert(err); - error_free(err); + error_free_or_abort(&err); visitor_reset(data); } } @@ -243,16 +241,14 @@ static void test_visitor_out_struct_errors(TestOutputVisitorData *data, EnumOne bad_values[] = { ENUM_ONE__MAX, -1 }; UserDefOne u = {0}; UserDefOne *pu = &u; - Error *err; + Error *err = NULL; int i; for (i = 0; i < ARRAY_SIZE(bad_values) ; i++) { - err = NULL; u.has_enum1 = true; u.enum1 = bad_values[i]; visit_type_UserDefOne(data->ov, "unused", &pu, &err); - g_assert(err); - error_free(err); + error_free_or_abort(&err); visitor_reset(data); } } -- 2.7.4