[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v8 06/17] qtest: check that drives are really appearing and disap
From: |
Paolo Bonzini |
Subject: |
[PATCH v8 06/17] qtest: check that drives are really appearing and disappearing |
Date: |
Wed, 7 Oct 2020 07:56:49 -0400 |
Do not just trust the HMP commands to create and delete the drive, use
query-block to check that this is actually the case.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
tests/qtest/drive_del-test.c | 32 +++++++++++++++++++++++++++++++-
1 file changed, 31 insertions(+), 1 deletion(-)
diff --git a/tests/qtest/drive_del-test.c b/tests/qtest/drive_del-test.c
index 9d20a1ed8b..ff772b3671 100644
--- a/tests/qtest/drive_del-test.c
+++ b/tests/qtest/drive_del-test.c
@@ -14,20 +14,49 @@
#include "libqos/libqtest.h"
#include "libqos/virtio.h"
#include "qapi/qmp/qdict.h"
+#include "qapi/qmp/qlist.h"
+
+static bool has_drive(QTestState *qts)
+{
+ QDict *response;
+ QList *ret;
+ QListEntry *entry;
+ bool found;
+
+ response = qtest_qmp(qts, "{'execute': 'query-block'}");
+ g_assert(response && qdict_haskey(response, "return"));
+ ret = qdict_get_qlist(response, "return");
+
+ found = false;
+ QLIST_FOREACH_ENTRY(ret, entry) {
+ QDict *entry_dict = qobject_to(QDict, entry->value);
+ if (!strcmp(qdict_get_str(entry_dict, "device"), "drive0")) {
+ found = true;
+ break;
+ }
+ }
+
+ qobject_unref(response);
+ return found;
+}
static void drive_add(QTestState *qts)
{
char *resp = qtest_hmp(qts, "drive_add 0 if=none,id=drive0");
g_assert_cmpstr(resp, ==, "OK\r\n");
+ g_assert(has_drive(qts));
g_free(resp);
}
static void drive_del(QTestState *qts)
{
- char *resp = qtest_hmp(qts, "drive_del drive0");
+ char *resp;
+ g_assert(has_drive(qts));
+ resp = qtest_hmp(qts, "drive_del drive0");
g_assert_cmpstr(resp, ==, "");
+ g_assert(!has_drive(qts));
g_free(resp);
}
@@ -130,6 +159,7 @@ static void test_drive_del_device_del(void)
*/
drive_del(qts);
device_del(qts);
+ g_assert(!has_drive(qts));
qtest_quit(qts);
}
--
2.26.2
- [PATCH v8 00/17] Fix scsi devices plug/unplug races w.r.t virtio-scsi iothread, Paolo Bonzini, 2020/10/07
- [PATCH v8 04/17] device-plug-test: use qtest_qmp to send the device_del command, Paolo Bonzini, 2020/10/07
- [PATCH v8 02/17] qtest: Reintroduce qtest_qmp_receive, Paolo Bonzini, 2020/10/07
- [PATCH v8 06/17] qtest: check that drives are really appearing and disappearing,
Paolo Bonzini <=
- [PATCH v8 01/17] qtest: rename qtest_qmp_receive to qtest_qmp_receive_dict, Paolo Bonzini, 2020/10/07
- [PATCH v8 03/17] qtest: remove qtest_qmp_receive_success, Paolo Bonzini, 2020/10/07
- [PATCH v8 05/17] qtest: switch users back to qtest_qmp_receive, Paolo Bonzini, 2020/10/07
- [PATCH v8 07/17] qemu-iotests, qtest: rewrite test 067 as a qtest, Paolo Bonzini, 2020/10/07
- [PATCH v8 09/17] scsi/scsi_bus: switch search direction in scsi_device_find, Paolo Bonzini, 2020/10/07
- [PATCH v8 08/17] qdev: add "check if address free" callback for buses, Paolo Bonzini, 2020/10/07
- [PATCH v8 12/17] scsi: switch to bus->check_address, Paolo Bonzini, 2020/10/07