From nobody Sun Feb 8 13:04:52 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1497373090752314.573164553378; Tue, 13 Jun 2017 09:58:10 -0700 (PDT) Received: from localhost ([::1]:44320 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dKp8q-00081g-Dz for importer@patchew.org; Tue, 13 Jun 2017 12:58:08 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50743) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dKp4D-0004BR-JW for qemu-devel@nongnu.org; Tue, 13 Jun 2017 12:53:23 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dKp4A-0000Mk-JD for qemu-devel@nongnu.org; Tue, 13 Jun 2017 12:53:21 -0400 Received: from mx1.redhat.com ([209.132.183.28]:57352) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dKp4A-0000ML-BQ for qemu-devel@nongnu.org; Tue, 13 Jun 2017 12:53:18 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 504B6C04B941; Tue, 13 Jun 2017 16:53:17 +0000 (UTC) Received: from localhost (ovpn-116-27.gru2.redhat.com [10.97.116.27]) by smtp.corp.redhat.com (Postfix) with ESMTP id D7B7D8A8DE; Tue, 13 Jun 2017 16:53:16 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 504B6C04B941 Authentication-Results: ext-mx07.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx07.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=ehabkost@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com 504B6C04B941 From: Eduardo Habkost To: qemu-devel@nongnu.org Date: Tue, 13 Jun 2017 13:52:59 -0300 Message-Id: <20170613165313.20954-2-ehabkost@redhat.com> In-Reply-To: <20170613165313.20954-1-ehabkost@redhat.com> References: <20170613165313.20954-1-ehabkost@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.31]); Tue, 13 Jun 2017 16:53:17 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [RFC 01/15] tests: Test cases for error API 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: Markus Armbruster , Michael Roth Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Signed-off-by: Eduardo Habkost --- tests/test-qapi-util.c | 99 ++++++++++++++++++++++++++++++++++++++++++++++= ++++ tests/Makefile.include | 2 +- 2 files changed, 100 insertions(+), 1 deletion(-) diff --git a/tests/test-qapi-util.c b/tests/test-qapi-util.c index e8697577a5..3695034c32 100644 --- a/tests/test-qapi-util.c +++ b/tests/test-qapi-util.c @@ -75,11 +75,110 @@ static void test_parse_qapi_name(void) g_assert(ret =3D=3D -1); } =20 +static void successfn(Error **errp) +{ + g_assert(!errp || !*errp); +} + +static void fail1(Error **errp) +{ + g_assert(!errp || !*errp); + + error_setg(errp, "error1"); + + g_assert(!errp || *errp); +} + +static void fail2(Error **errp) +{ + g_assert(!errp || !*errp); + + error_setg(errp, "error2"); + + g_assert(!errp || *errp); +} + +static void multifn(Error **errp) +{ + Error *err1 =3D NULL, *err2 =3D NULL; + successfn(&err1); + g_assert(!err1); + + fail1(&err1); + g_assert(err1); + g_assert_cmpstr(error_get_pretty(err1), =3D=3D, "error1"); + + fail2(&err2); + g_assert(err2); + g_assert_cmpstr(error_get_pretty(err2), =3D=3D, "error2"); + + error_propagate(&err1, err2); + g_assert(err1); + g_assert_cmpstr(error_get_pretty(err1), =3D=3D, "error1"); + + error_propagate(errp, err1); +} + +static void test_propagate(void (*fn)(Error **), Error **errp) +{ + bool failed; + Error *local_err =3D NULL; + + g_assert(!errp || !*errp); + + fn(&local_err); + failed =3D !!local_err; + error_propagate(errp, local_err); + + g_assert(!errp || (failed =3D=3D !!*errp)); +} + +static void test_error_api(void) +{ + Error *err =3D NULL; + + successfn(NULL); + test_propagate(successfn, NULL); + + fail1(NULL); + test_propagate(fail1, NULL); + + multifn(NULL); + test_propagate(multifn, NULL); + + successfn(&err); + g_assert(!err); + + test_propagate(successfn, &err); + g_assert(!err); + + fail1(&err); + g_assert(err); + g_assert_cmpstr(error_get_pretty(err), =3D=3D, "error1"); + error_free_or_abort(&err); + + test_propagate(fail1, &err); + g_assert(err); + g_assert_cmpstr(error_get_pretty(err), =3D=3D, "error1"); + error_free_or_abort(&err); + + multifn(&err); + g_assert(err); + g_assert_cmpstr(error_get_pretty(err), =3D=3D, "error1"); + error_free_or_abort(&err); + + test_propagate(multifn, &err); + g_assert(err); + g_assert_cmpstr(error_get_pretty(err), =3D=3D, "error1"); + error_free_or_abort(&err); +} + int main(int argc, char *argv[]) { g_test_init(&argc, &argv, NULL); g_test_add_func("/qapi/util/qapi_enum_parse", test_qapi_enum_parse); g_test_add_func("/qapi/util/parse_qapi_name", test_parse_qapi_name); + g_test_add_func("/qapi/util/error", test_error_api); g_test_run(); return 0; } diff --git a/tests/Makefile.include b/tests/Makefile.include index f42f3dfa72..e38abfabeb 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include @@ -129,7 +129,7 @@ check-unit-y +=3D tests/test-uuid$(EXESUF) check-unit-y +=3D tests/ptimer-test$(EXESUF) gcov-files-ptimer-test-y =3D hw/core/ptimer.c check-unit-y +=3D tests/test-qapi-util$(EXESUF) -gcov-files-test-qapi-util-y =3D qapi/qapi-util.c +gcov-files-test-qapi-util-y =3D qapi/qapi-util.c qapi/error.c =20 check-block-$(CONFIG_POSIX) +=3D tests/qemu-iotests-quick.sh =20 --=20 2.11.0.259.g40922b1