From nobody Wed Nov 27 04:35:19 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1700637958; cv=none; d=zohomail.com; s=zohoarc; b=YmQ5pMd3lmtYyZ/j+ufmjVKh9g6BsytYo1Gqh9vBdjGFH17L9u9LV21YctnmR2GuFcMlZCKhSC8RTczgjYWMPWWYwcb6E44LgMAst2xJRDsAhb3FKRRaHLFpZYecUeem4148tNY9xp/OrlHEv/9A/isn6g5JzoVngS3/FZd91rI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1700637958; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=G6TnX9Kxvfwwi76JemoBX3SqpT8cHEynqAZXqVh+SQc=; b=FRS5Iw/EGfS5Rg8uTyBAFKDHke7xwZB2EyW2Y8gss7krblHE6c+xradCd5AaMj1G+SYXdm8TOg/Od/Aw1IxHuIymEfxo2SRFMM9hUTIynbxra+7Fo8e39cB7udF+Ll+FhRh7XMgHUymvbxdWJXoAdScQes/EdGaZsDneexJrBlY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1700637958552428.9097251699717; Tue, 21 Nov 2023 23:25:58 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r5hbh-0002qc-EK; Wed, 22 Nov 2023 02:25:09 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1r5hbe-0002pi-Hy for qemu-devel@nongnu.org; Wed, 22 Nov 2023 02:25:06 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1r5hbc-0000pR-NZ for qemu-devel@nongnu.org; Wed, 22 Nov 2023 02:25:06 -0500 Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-237-R57YFIk9NxKxUkJQyWMP_A-1; Wed, 22 Nov 2023 02:24:57 -0500 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id A26A51C0514C; Wed, 22 Nov 2023 07:24:57 +0000 (UTC) Received: from blackfin.pond.sub.org (unknown [10.39.192.148]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 7F9471121306; Wed, 22 Nov 2023 07:24:57 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 655D221E6A21; Wed, 22 Nov 2023 08:24:56 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1700637901; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=G6TnX9Kxvfwwi76JemoBX3SqpT8cHEynqAZXqVh+SQc=; b=amXkiQxXM5b4isIhwhHq76tnlS6RKcT6QXUYA6oop8Kus2ia0uEcl+oKcgfJrejYy+0UBo C2GCYnRGd89iRw239TbFxhPEfmmuOiWhdzW+qMGZkmuDX4C8n5ewEkPu3i0/P/jeUxrhmo xFmq4FeIN/NGeiy51NwWeg4SFqjpf7Y= X-MC-Unique: R57YFIk9NxKxUkJQyWMP_A-1 From: Markus Armbruster To: qemu-devel@nongnu.org Cc: michael.roth@amd.com Subject: [PATCH 1/3] tests/unit/test-qmp-event: Drop superfluous mutex Date: Wed, 22 Nov 2023 08:24:54 +0100 Message-ID: <20231122072456.2518816-2-armbru@redhat.com> In-Reply-To: <20231122072456.2518816-1-armbru@redhat.com> References: <20231122072456.2518816-1-armbru@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.3 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=armbru@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1700637959510100001 Content-Type: text/plain; charset="utf-8" Mutex @test_event_lock is held from fixture setup to teardown, protecting global variable @test_event_data. But tests always run one after the other, so this is superfluous. It also confuses Coverity. Drop the mutex. Fixes: CID 1527425 Signed-off-by: Markus Armbruster Reviewed-by: Thomas Huth --- tests/unit/test-qmp-event.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/tests/unit/test-qmp-event.c b/tests/unit/test-qmp-event.c index 3626d2372f..c2c44687d5 100644 --- a/tests/unit/test-qmp-event.c +++ b/tests/unit/test-qmp-event.c @@ -30,7 +30,6 @@ typedef struct TestEventData { } TestEventData; =20 TestEventData *test_event_data; -static GMutex test_event_lock; =20 void test_qapi_event_emit(test_QAPIEvent event, QDict *d) { @@ -59,9 +58,6 @@ void test_qapi_event_emit(test_QAPIEvent event, QDict *d) static void event_prepare(TestEventData *data, const void *unused) { - /* Global variable test_event_data was used to pass the expectation, so - test cases can't be executed at same time. */ - g_mutex_lock(&test_event_lock); test_event_data =3D data; } =20 @@ -69,7 +65,6 @@ static void event_teardown(TestEventData *data, const void *unused) { test_event_data =3D NULL; - g_mutex_unlock(&test_event_lock); } =20 static void event_test_add(const char *testpath, --=20 2.41.0 From nobody Wed Nov 27 04:35:19 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1700637941; cv=none; d=zohomail.com; s=zohoarc; b=NkC35hdzWlamL41GH6eA3WCBDWymcX09fqo6baYJFlxm/VoflXKbbkphsnRMCM1EpULb1RJc1+12Vcz+ImwQYIsy8lEPRXNE9605IdTNtJ150Q6qlgtFjiax6qAwpCtgfh7s0sdh2xNXygO4HDpIrbYIzx7L9LnZL3+7rYf8bJk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1700637941; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=9PWoM8iQdTlPU10tjiBCtb7JORef176ceu3tahA0U/M=; b=UdspGHRCuqbGlLvcbyN6vla07ivi2TPfSDEN70pMwMvnaBHx6UhjpoogBV4xn1KxHbkgFqr+HBO7573FN5UpZ8vUUUgDfCi+NOY3rJmynl2ZLy9BXFKpRkwwi6ENFU2jXXxaU5c0uOVU8v6/DWlk7A5e5i1lQn8twyQWOVaMG3I= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1700637941443987.61903751785; Tue, 21 Nov 2023 23:25:41 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r5hbg-0002q2-MX; Wed, 22 Nov 2023 02:25:08 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1r5hbe-0002pj-He for qemu-devel@nongnu.org; Wed, 22 Nov 2023 02:25:06 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1r5hbc-0000pQ-NZ for qemu-devel@nongnu.org; Wed, 22 Nov 2023 02:25:06 -0500 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-237-5awHaapeMOyzizihUU9y6Q-1; Wed, 22 Nov 2023 02:24:58 -0500 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id BAD1885C6E0; Wed, 22 Nov 2023 07:24:57 +0000 (UTC) Received: from blackfin.pond.sub.org (unknown [10.39.192.148]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 7F8D8492BFA; Wed, 22 Nov 2023 07:24:57 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 6761521E6A22; Wed, 22 Nov 2023 08:24:56 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1700637901; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=9PWoM8iQdTlPU10tjiBCtb7JORef176ceu3tahA0U/M=; b=Mb33Qf7F8Mm6dlVh52Ke0yhrYO/fUOtGZzBAlHt6QE/WhsVXUpXRqPODr6VWmpGG4wEgqN 69udTAoTCC9zs0s/Jn1umJ9N7QyBCJv17jK/BwFPYHVULkFxJR9IquLo+lJPycPY2hmyjx tJSGtA2m7z2ZF+zGCPmxBThMrvD2fu0= X-MC-Unique: 5awHaapeMOyzizihUU9y6Q-1 From: Markus Armbruster To: qemu-devel@nongnu.org Cc: michael.roth@amd.com Subject: [PATCH 2/3] tests/unit/test-qmp-event: Simplify event emission check Date: Wed, 22 Nov 2023 08:24:55 +0100 Message-ID: <20231122072456.2518816-3-armbru@redhat.com> In-Reply-To: <20231122072456.2518816-1-armbru@redhat.com> References: <20231122072456.2518816-1-armbru@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.10 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=armbru@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1700637943487100004 Content-Type: text/plain; charset="utf-8" The generated qapi_event_send_FOO() call an event emitter function. It's test_qapi_event_emit() in this test. It compares the actual event to the expected event, and sets a flag to record it was called. The test functions set expected data and clear the flag before calling qapi_event_send_FOO(), and check the flag afterwards. Make test_qapi_event_emit() consume expected data, and the test functions check it was consumed. Delete the flag. This is simpler. It also catches extraneous calls of test_qapi_event_emit(). Catching that is not worthwhile, but since the cost is negative... Signed-off-by: Markus Armbruster Reviewed-by: Thomas Huth --- tests/unit/test-qmp-event.c | 30 ++++++++++-------------------- 1 file changed, 10 insertions(+), 20 deletions(-) diff --git a/tests/unit/test-qmp-event.c b/tests/unit/test-qmp-event.c index c2c44687d5..5c9837e849 100644 --- a/tests/unit/test-qmp-event.c +++ b/tests/unit/test-qmp-event.c @@ -26,7 +26,6 @@ =20 typedef struct TestEventData { QDict *expect; - bool emitted; } TestEventData; =20 TestEventData *test_event_data; @@ -36,6 +35,8 @@ void test_qapi_event_emit(test_QAPIEvent event, QDict *d) QDict *t; int64_t s, ms; =20 + g_assert(test_event_data->expect); + /* Verify that we have timestamp, then remove it to compare other fiel= ds */ t =3D qdict_get_qdict(d, "timestamp"); g_assert(t); @@ -52,7 +53,8 @@ void test_qapi_event_emit(test_QAPIEvent event, QDict *d) qdict_del(d, "timestamp"); =20 g_assert(qobject_is_equal(QOBJECT(d), QOBJECT(test_event_data->expect)= )); - test_event_data->emitted =3D true; + qobject_unref(test_event_data->expect); + test_event_data->expect =3D NULL; } =20 static void event_prepare(TestEventData *data, @@ -83,8 +85,7 @@ static void test_event_a(TestEventData *data, { data->expect =3D qdict_from_jsonf_nofail("{ 'event': 'EVENT_A' }"); qapi_event_send_event_a(); - g_assert(data->emitted); - qobject_unref(data->expect); + g_assert(!data->expect); } =20 static void test_event_b(TestEventData *data, @@ -92,8 +93,7 @@ static void test_event_b(TestEventData *data, { data->expect =3D qdict_from_jsonf_nofail("{ 'event': 'EVENT_B' }"); qapi_event_send_event_b(); - g_assert(data->emitted); - qobject_unref(data->expect); + g_assert(!data->expect); } =20 static void test_event_c(TestEventData *data, @@ -105,8 +105,7 @@ static void test_event_c(TestEventData *data, "{ 'event': 'EVENT_C', 'data': {" " 'a': 1, 'b': { 'integer': 2, 'string': 'test1' }, 'c': 'test2' }= }"); qapi_event_send_event_c(true, 1, &b, "test2"); - g_assert(data->emitted); - qobject_unref(data->expect); + g_assert(!data->expect); } =20 /* Complex type */ @@ -131,8 +130,7 @@ static void test_event_d(TestEventData *data, " 'string': 'test2', 'enum2': 'value2' }," " 'b': 'test3', 'enum3': 'value3' } }"); qapi_event_send_event_d(&a, "test3", NULL, true, ENUM_ONE_VALUE3); - g_assert(data->emitted); - qobject_unref(data->expect); + g_assert(!data->expect); } =20 static void test_event_deprecated(TestEventData *data, const void *unused) @@ -142,15 +140,11 @@ static void test_event_deprecated(TestEventData *data= , const void *unused) memset(&compat_policy, 0, sizeof(compat_policy)); =20 qapi_event_send_test_event_features1(); - g_assert(data->emitted); + g_assert(!data->expect); =20 compat_policy.has_deprecated_output =3D true; compat_policy.deprecated_output =3D COMPAT_POLICY_OUTPUT_HIDE; - data->emitted =3D false; qapi_event_send_test_event_features1(); - g_assert(!data->emitted); - - qobject_unref(data->expect); } =20 static void test_event_deprecated_data(TestEventData *data, const void *un= used) @@ -160,17 +154,13 @@ static void test_event_deprecated_data(TestEventData = *data, const void *unused) data->expect =3D qdict_from_jsonf_nofail("{ 'event': 'TEST_EVENT_FEATU= RES0'," " 'data': { 'foo': 42 } }"); qapi_event_send_test_event_features0(42); - g_assert(data->emitted); + g_assert(!data->expect); =20 - qobject_unref(data->expect); =20 compat_policy.has_deprecated_output =3D true; compat_policy.deprecated_output =3D COMPAT_POLICY_OUTPUT_HIDE; data->expect =3D qdict_from_jsonf_nofail("{ 'event': 'TEST_EVENT_FEATU= RES0' }"); qapi_event_send_test_event_features0(42); - g_assert(data->emitted); - - qobject_unref(data->expect); } =20 int main(int argc, char **argv) --=20 2.41.0 From nobody Wed Nov 27 04:35:19 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1700637942; cv=none; d=zohomail.com; s=zohoarc; b=VgolKiUByTOV+HdNp1OSBZ/+v6sDX1qXJWWqjF7PwWU60gAjxr2NJGrqz3IRCG6N/i+VPHXiBgpVpqKltL1pBq+OXG2AFbSedN36kvXRlSQ5+h7B1lci0NFFpbD9/IJsbXjWfRFEpL+VJiQP1zZoaADzWcESJ3pEPD53fKz9S68= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1700637942; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=mrugsTZqCq/1bk2RXJxeMf82BcconNlsB2uCisKzpLk=; b=SpAJam0Q0w4aTdIDbZCF8VPp2iYUuzOAeLmf64EUV1p9J7kfT9uCXqQRqCsOuGLTOrbviGBY6gVOtZ5nnkGLho6QXztEUZGMndWaiQHR7Cv4tn7vGo5JDbodZXn/vNislYrGzg8BIYAjI6ZkrNB5omQvmslfu423BAu7xXYznWA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1700637942417750.7044588243062; Tue, 21 Nov 2023 23:25:42 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r5hbl-0002rJ-Kw; Wed, 22 Nov 2023 02:25:13 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1r5hbj-0002r4-3t for qemu-devel@nongnu.org; Wed, 22 Nov 2023 02:25:11 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1r5hbd-0000pO-1I for qemu-devel@nongnu.org; Wed, 22 Nov 2023 02:25:10 -0500 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-237-lLw2w9tOP8iO97PYhGOQZQ-1; Wed, 22 Nov 2023 02:24:58 -0500 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id BBDD58007B3; Wed, 22 Nov 2023 07:24:57 +0000 (UTC) Received: from blackfin.pond.sub.org (unknown [10.39.192.148]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 7F9282026D66; Wed, 22 Nov 2023 07:24:57 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 6A3D121E6A23; Wed, 22 Nov 2023 08:24:56 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1700637901; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=mrugsTZqCq/1bk2RXJxeMf82BcconNlsB2uCisKzpLk=; b=ME2PB2P+hnM0NwhYlF5+F5lGEZRA2m842QjOkcAjARnvW3ygQKInqJI6G2430KiqXskXM8 EjeRE7cFmdKiyCNt0Kzp0ypVWKF0jYKtn3nN852WhvQoYOM9uFIKF/Xzw5IHh0jjJkKFfy ipo85DB85jiNEEh1ycTh2MdV56dmx0Q= X-MC-Unique: lLw2w9tOP8iO97PYhGOQZQ-1 From: Markus Armbruster To: qemu-devel@nongnu.org Cc: michael.roth@amd.com Subject: [PATCH 3/3] tests/unit/test-qmp-event: Replace fixture by global variables Date: Wed, 22 Nov 2023 08:24:56 +0100 Message-ID: <20231122072456.2518816-4-armbru@redhat.com> In-Reply-To: <20231122072456.2518816-1-armbru@redhat.com> References: <20231122072456.2518816-1-armbru@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.4 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=armbru@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, T_SCC_BODY_TEXT_LINE=-0.01, T_SPF_TEMPERROR=0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1700637943482100003 Content-Type: text/plain; charset="utf-8" The fixture buys us exactly nothing, as we need a global variable anyway, for test_qapi_event_emit(). Drop it. Signed-off-by: Markus Armbruster Reviewed-by: Thomas Huth --- tests/unit/test-qmp-event.c | 91 ++++++++++++------------------------- 1 file changed, 30 insertions(+), 61 deletions(-) diff --git a/tests/unit/test-qmp-event.c b/tests/unit/test-qmp-event.c index 5c9837e849..08e95a382b 100644 --- a/tests/unit/test-qmp-event.c +++ b/tests/unit/test-qmp-event.c @@ -24,18 +24,14 @@ #include "test-qapi-events.h" #include "test-qapi-emit-events.h" =20 -typedef struct TestEventData { - QDict *expect; -} TestEventData; - -TestEventData *test_event_data; +static QDict *expected_event; =20 void test_qapi_event_emit(test_QAPIEvent event, QDict *d) { QDict *t; int64_t s, ms; =20 - g_assert(test_event_data->expect); + g_assert(expected_event); =20 /* Verify that we have timestamp, then remove it to compare other fiel= ds */ t =3D qdict_get_qdict(d, "timestamp"); @@ -52,65 +48,38 @@ void test_qapi_event_emit(test_QAPIEvent event, QDict *= d) =20 qdict_del(d, "timestamp"); =20 - g_assert(qobject_is_equal(QOBJECT(d), QOBJECT(test_event_data->expect)= )); - qobject_unref(test_event_data->expect); - test_event_data->expect =3D NULL; + g_assert(qobject_is_equal(QOBJECT(d), QOBJECT(expected_event))); + qobject_unref(expected_event); + expected_event =3D NULL; } =20 -static void event_prepare(TestEventData *data, - const void *unused) +static void test_event_a(void) { - test_event_data =3D data; -} - -static void event_teardown(TestEventData *data, - const void *unused) -{ - test_event_data =3D NULL; -} - -static void event_test_add(const char *testpath, - void (*test_func)(TestEventData *data, - const void *user_data)) -{ - g_test_add(testpath, TestEventData, NULL, event_prepare, test_func, - event_teardown); -} - - -/* Test cases */ - -static void test_event_a(TestEventData *data, - const void *unused) -{ - data->expect =3D qdict_from_jsonf_nofail("{ 'event': 'EVENT_A' }"); + expected_event =3D qdict_from_jsonf_nofail("{ 'event': 'EVENT_A' }"); qapi_event_send_event_a(); - g_assert(!data->expect); + g_assert(!expected_event); } =20 -static void test_event_b(TestEventData *data, - const void *unused) +static void test_event_b(void) { - data->expect =3D qdict_from_jsonf_nofail("{ 'event': 'EVENT_B' }"); + expected_event =3D qdict_from_jsonf_nofail("{ 'event': 'EVENT_B' }"); qapi_event_send_event_b(); - g_assert(!data->expect); + g_assert(!expected_event); } =20 -static void test_event_c(TestEventData *data, - const void *unused) +static void test_event_c(void) { UserDefOne b =3D { .integer =3D 2, .string =3D (char *)"test1" }; =20 - data->expect =3D qdict_from_jsonf_nofail( + expected_event =3D qdict_from_jsonf_nofail( "{ 'event': 'EVENT_C', 'data': {" " 'a': 1, 'b': { 'integer': 2, 'string': 'test1' }, 'c': 'test2' }= }"); qapi_event_send_event_c(true, 1, &b, "test2"); - g_assert(!data->expect); + g_assert(!expected_event); } =20 /* Complex type */ -static void test_event_d(TestEventData *data, - const void *unused) +static void test_event_d(void) { UserDefOne struct1 =3D { .integer =3D 2, .string =3D (char *)"test1", @@ -123,43 +92,43 @@ static void test_event_d(TestEventData *data, .enum2 =3D ENUM_ONE_VALUE2, }; =20 - data->expect =3D qdict_from_jsonf_nofail( + expected_event =3D qdict_from_jsonf_nofail( "{ 'event': 'EVENT_D', 'data': {" " 'a': {" " 'struct1': { 'integer': 2, 'string': 'test1', 'enum1': 'value1'= }," " 'string': 'test2', 'enum2': 'value2' }," " 'b': 'test3', 'enum3': 'value3' } }"); qapi_event_send_event_d(&a, "test3", NULL, true, ENUM_ONE_VALUE3); - g_assert(!data->expect); + g_assert(!expected_event); } =20 -static void test_event_deprecated(TestEventData *data, const void *unused) +static void test_event_deprecated(void) { - data->expect =3D qdict_from_jsonf_nofail("{ 'event': 'TEST_EVENT_FEATU= RES1' }"); + expected_event =3D qdict_from_jsonf_nofail("{ 'event': 'TEST_EVENT_FEA= TURES1' }"); =20 memset(&compat_policy, 0, sizeof(compat_policy)); =20 qapi_event_send_test_event_features1(); - g_assert(!data->expect); + g_assert(!expected_event); =20 compat_policy.has_deprecated_output =3D true; compat_policy.deprecated_output =3D COMPAT_POLICY_OUTPUT_HIDE; qapi_event_send_test_event_features1(); } =20 -static void test_event_deprecated_data(TestEventData *data, const void *un= used) +static void test_event_deprecated_data(void) { memset(&compat_policy, 0, sizeof(compat_policy)); =20 - data->expect =3D qdict_from_jsonf_nofail("{ 'event': 'TEST_EVENT_FEATU= RES0'," + expected_event =3D qdict_from_jsonf_nofail("{ 'event': 'TEST_EVENT_FEA= TURES0'," " 'data': { 'foo': 42 } }"); qapi_event_send_test_event_features0(42); - g_assert(!data->expect); + g_assert(!expected_event); =20 =20 compat_policy.has_deprecated_output =3D true; compat_policy.deprecated_output =3D COMPAT_POLICY_OUTPUT_HIDE; - data->expect =3D qdict_from_jsonf_nofail("{ 'event': 'TEST_EVENT_FEATU= RES0' }"); + expected_event =3D qdict_from_jsonf_nofail("{ 'event': 'TEST_EVENT_FEA= TURES0' }"); qapi_event_send_test_event_features0(42); } =20 @@ -167,12 +136,12 @@ int main(int argc, char **argv) { g_test_init(&argc, &argv, NULL); =20 - event_test_add("/event/event_a", test_event_a); - event_test_add("/event/event_b", test_event_b); - event_test_add("/event/event_c", test_event_c); - event_test_add("/event/event_d", test_event_d); - event_test_add("/event/deprecated", test_event_deprecated); - event_test_add("/event/deprecated_data", test_event_deprecated_data); + g_test_add_func("/event/event_a", test_event_a); + g_test_add_func("/event/event_b", test_event_b); + g_test_add_func("/event/event_c", test_event_c); + g_test_add_func("/event/event_d", test_event_d); + g_test_add_func("/event/deprecated", test_event_deprecated); + g_test_add_func("/event/deprecated_data", test_event_deprecated_data); g_test_run(); =20 return 0; --=20 2.41.0