From e2f3f221885a90de766ce9a38b87badeb658635a Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Thu, 2 Oct 2014 16:51:31 +0200 Subject: drive_del-test: Merge of qdev-monitor-test, blockdev-test Each of qdev-monitor-test and blockdev-test has just one test case, and both are about drive_del. [Extended copyright from 2013 to 2013-2014 as requested by Eric Blake. --Stefan] Signed-off-by: Markus Armbruster Reviewed-by: Eric Blake Message-id: 1412261496-24455-2-git-send-email-armbru@redhat.com Signed-off-by: Stefan Hajnoczi --- tests/qdev-monitor-test.c | 77 ----------------------------------------------- 1 file changed, 77 deletions(-) delete mode 100644 tests/qdev-monitor-test.c (limited to 'tests/qdev-monitor-test.c') diff --git a/tests/qdev-monitor-test.c b/tests/qdev-monitor-test.c deleted file mode 100644 index e20ffd67a7..0000000000 --- a/tests/qdev-monitor-test.c +++ /dev/null @@ -1,77 +0,0 @@ -/* - * qdev-monitor.c test cases - * - * Copyright (C) 2013 Red Hat Inc. - * - * Authors: - * Stefan Hajnoczi - * - * This work is licensed under the terms of the GNU LGPL, version 2.1 or later. - * See the COPYING.LIB file in the top-level directory. - */ - -#include -#include -#include "libqtest.h" -#include "qapi/qmp/qjson.h" - -static void test_device_add(void) -{ - QDict *response; - QDict *error; - - qtest_start("-drive if=none,id=drive0"); - - /* Make device_add fail. If this leaks the virtio-blk-pci device then a - * reference to drive0 will also be held (via qdev properties). - */ - response = qmp("{\"execute\": \"device_add\"," - " \"arguments\": {" - " \"driver\": \"virtio-blk-pci\"," - " \"drive\": \"drive0\"" - "}}"); - g_assert(response); - error = qdict_get_qdict(response, "error"); - g_assert_cmpstr(qdict_get_try_str(error, "class"), ==, "GenericError"); - 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); - - /* 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 pci-addr=auto if=none,id=drive0\"" - "}}"); - g_assert(response); - g_assert_cmpstr(qdict_get_try_str(response, "return"), ==, "OK\r\n"); - QDECREF(response); - - qtest_end(); -} - -int main(int argc, char **argv) -{ - const char *arch = qtest_get_arch(); - - /* Check architecture */ - if (strcmp(arch, "i386") && strcmp(arch, "x86_64")) { - g_test_message("Skipping test for non-x86\n"); - return 0; - } - - /* Run the tests */ - g_test_init(&argc, &argv, NULL); - - qtest_add_func("/qmp/device_add", test_device_add); - - return g_test_run(); -} -- cgit v1.2.1