Commit e2f3f221 authored by Markus Armbruster's avatar Markus Armbruster Committed by Stefan Hajnoczi
Browse files

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: default avatarMarkus Armbruster <armbru@redhat.com>
Reviewed-by: default avatarEric Blake <eblake@redhat.com>
Message-id: 1412261496-24455-2-git-send-email-armbru@redhat.com
Signed-off-by: default avatarStefan Hajnoczi <stefanha@redhat.com>
parent f383611a

tests/Makefile

+2 −3
Original line number Diff line number Diff line
@@ -140,8 +140,7 @@ check-qtest-i386-y += tests/bios-tables-test$(EXESUF) 
check-qtest-i386-y += tests/rtc-test$(EXESUF)

check-qtest-i386-y += tests/i440fx-test$(EXESUF)

check-qtest-i386-y += tests/fw_cfg-test$(EXESUF)

check-qtest-i386-y += tests/blockdev-test$(EXESUF)

check-qtest-i386-y += tests/qdev-monitor-test$(EXESUF)

check-qtest-i386-y += tests/drive_del-test$(EXESUF)

check-qtest-i386-y += tests/wdt_ib700-test$(EXESUF)

gcov-files-i386-y += hw/watchdog/watchdog.c hw/watchdog/wdt_ib700.c

check-qtest-i386-y += $(check-qtest-pci-y)
@@ -335,7 +334,7 @@ tests/tpci200-test$(EXESUF): tests/tpci200-test.o 
tests/display-vga-test$(EXESUF): tests/display-vga-test.o

tests/ipoctal232-test$(EXESUF): tests/ipoctal232-test.o

tests/qom-test$(EXESUF): tests/qom-test.o

tests/blockdev-test$(EXESUF): tests/blockdev-test.o $(libqos-pc-obj-y)

tests/drive_del-test$(EXESUF): tests/drive_del-test.o $(libqos-pc-obj-y)

tests/qdev-monitor-test$(EXESUF): tests/qdev-monitor-test.o $(libqos-pc-obj-y)

tests/nvme-test$(EXESUF): tests/nvme-test.o

tests/pvpanic-test$(EXESUF): tests/pvpanic-test.o

tests/blockdev-test.c

deleted100644 → 0
+0 −59
Original line number Diff line number Diff line 
/*

 * blockdev.c test cases

 *

 * Copyright (C) 2013 Red Hat Inc.

 *

 * Authors:

 *  Stefan Hajnoczi <stefanha@redhat.com>

 *

 * 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 <glib.h>

#include <string.h>

#include "libqtest.h"



static void test_drive_add_empty(void)

{

    QDict *response;

    const char *response_return;



    /* 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);

    response_return = qdict_get_try_str(response, "return");

    g_assert(response_return);

    g_assert(strcmp(response_return, "") == 0);

    QDECREF(response);



    /* 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);

    response_return = qdict_get_try_str(response, "return");

    g_assert(response_return);

    g_assert(strcmp(response_return, "OK\r\n") == 0);

    QDECREF(response);



    qtest_end();

}



int main(int argc, char **argv)

{

    g_test_init(&argc, &argv, NULL);



    qtest_add_func("/qmp/drive_add_empty", test_drive_add_empty);



    return g_test_run();

}

tests/qdev-monitor-test.c→tests/drive_del-test.c

+46 −13
Original line number Diff line number Diff line 
/*

 * qdev-monitor.c test cases

 * blockdev.c test cases

 *

 * Copyright (C) 2013 Red Hat Inc.

 * Copyright (C) 2013-2014 Red Hat Inc.

 *

 * Authors:

 *  Stefan Hajnoczi <stefanha@redhat.com>
@@ -10,12 +10,46 @@ 
 * See the COPYING.LIB file in the top-level directory.

 */



#include <string.h>

#include <glib.h>

#include <string.h>

#include "libqtest.h"

#include "qapi/qmp/qjson.h"



static void test_device_add(void)

static void test_drive_without_dev(void)

{

    QDict *response;

    const char *response_return;



    /* 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);

    response_return = qdict_get_try_str(response, "return");

    g_assert(response_return);

    g_assert(strcmp(response_return, "") == 0);

    QDECREF(response);



    /* 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);

    response_return = qdict_get_try_str(response, "return");

    g_assert(response_return);

    g_assert(strcmp(response_return, "OK\r\n") == 0);

    QDECREF(response);



    qtest_end();

}



static void test_after_failed_device_add(void)

{

    QDict *response;

    QDict *error;
@@ -62,16 +96,15 @@ 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);

    qtest_add_func("/drive_del/without-dev", test_drive_without_dev);



    /* TODO I guess any arch with PCI would do */

    if (!strcmp(arch, "i386") || !strcmp(arch, "x86_64")) {

        qtest_add_func("/drive_del/after_failed_device_add",

                       test_after_failed_device_add);

    }



    return g_test_run();

}