From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40405) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XZhjR-0004y3-7R for qemu-devel@nongnu.org; Thu, 02 Oct 2014 10:51:55 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XZhjK-0003UX-20 for qemu-devel@nongnu.org; Thu, 02 Oct 2014 10:51:49 -0400 Received: from mx1.redhat.com ([209.132.183.28]:42305) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XZhjJ-0003UH-QW for qemu-devel@nongnu.org; Thu, 02 Oct 2014 10:51:41 -0400 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s92Epfvv017543 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL) for ; Thu, 2 Oct 2014 10:51:41 -0400 From: Markus Armbruster Date: Thu, 2 Oct 2014 16:51:35 +0200 Message-Id: <1412261496-24455-6-git-send-email-armbru@redhat.com> In-Reply-To: <1412261496-24455-1-git-send-email-armbru@redhat.com> References: <1412261496-24455-1-git-send-email-armbru@redhat.com> Subject: [Qemu-devel] [PATCH 5/6] blockdev-test: Factor out some common code into helpers List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kwolf@redhat.com, stefanha@redhat.com Signed-off-by: Markus Armbruster --- tests/drive_del-test.c | 60 +++++++++++++++++++++++++------------------------- 1 file changed, 30 insertions(+), 30 deletions(-) diff --git a/tests/drive_del-test.c b/tests/drive_del-test.c index 2baf0b7..463479d 100644 --- a/tests/drive_del-test.c +++ b/tests/drive_del-test.c @@ -14,32 +14,44 @@ #include #include "libqtest.h" +static void drive_add(void) +{ + QDict *response; + + response = qmp("{'execute': 'human-monitor-command'," + " 'arguments': {" + " 'command-line': 'drive_add 0 if=none,id=drive0'" + "}}"); + g_assert(response); + g_assert_cmpstr(qdict_get_try_str(response, "return"), ==, "OK\r\n"); + QDECREF(response); +} + +static void drive_del(void) +{ + QDict *response; + + response = qmp("{'execute': 'human-monitor-command'," + " 'arguments': {" + " 'command-line': 'drive_del drive0'" + "}}"); + g_assert(response); + g_assert_cmpstr(qdict_get_try_str(response, "return"), ==, ""); + QDECREF(response); +} + static void test_drive_without_dev(void) { - QDict *response; - /* Start with an empty drive */ qtest_start("-drive if=none,id=drive0"); /* Delete the drive */ - response = qmp("{'execute': 'human-monitor-command'," - " 'arguments': {" - " 'command-line': 'drive_del drive0'" - "}}"); - g_assert(response); - g_assert_cmpstr(qdict_get_try_str(response, "return"), ==, ""); - QDECREF(response); + drive_del(); /* Ensure re-adding the drive works - there should be no duplicate ID error * because the old drive must be gone. */ - response = qmp("{'execute': 'human-monitor-command'," - " 'arguments': {" - " 'command-line': 'drive_add 0 if=none,id=drive0'" - "}}"); - g_assert(response); - g_assert_cmpstr(qdict_get_try_str(response, "return"), ==, "OK\r\n"); - QDECREF(response); + drive_add(); qtest_end(); } @@ -65,24 +77,12 @@ static void test_after_failed_device_add(void) QDECREF(response); /* Delete the drive */ - response = qmp("{'execute': 'human-monitor-command'," - " 'arguments': {" - " 'command-line': 'drive_del drive0'" - "}}"); - g_assert(response); - g_assert_cmpstr(qdict_get_try_str(response, "return"), ==, ""); - QDECREF(response); + drive_del(); /* Try to re-add the drive. This fails with duplicate IDs if a leaked * virtio-blk-pci exists that holds a reference to the old drive0. */ - response = qmp("{'execute': 'human-monitor-command'," - " 'arguments': {" - " 'command-line': 'drive_add 0 if=none,id=drive0'" - "}}"); - g_assert(response); - g_assert_cmpstr(qdict_get_try_str(response, "return"), ==, "OK\r\n"); - QDECREF(response); + drive_add(); qtest_end(); } -- 1.9.3