aboutsummaryrefslogtreecommitdiff
path: root/tests/boot-order-test.c
diff options
context:
space:
mode:
authorMarkus Armbruster <armbru@redhat.com>2017-09-11 12:19:48 -0500
committerThomas Huth <thuth@redhat.com>2018-02-14 10:08:40 +0100
commit2c58c27beeba1a5be4bceeb283cbc90d4233a090 (patch)
tree812da89e85c44a2967e2112b1f2a51fe3151fe92 /tests/boot-order-test.c
parentbec9c64ef7be8063f1192608b83877bc5c9ea217 (diff)
tests: Clean up wait for event
We still use hacks like qmp("") to wait for an event, even though we have qmp_eventwait() since commit 8fe941f, and qmp_eventwait_ref() since commit 7ffe312. Both commits neglected to convert all the existing hacks. Make up what they missed. Bonus: gets rid of empty format strings. A step towards compile-time format string checking without triggering -Wformat-zero-length. Signed-off-by: Markus Armbruster <armbru@redhat.com> Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com> Signed-off-by: Eric Blake <eblake@redhat.com> [thuth: dropped the hunks from the usb tests - not needed anymore] Signed-off-by: Thomas Huth <thuth@redhat.com>
Diffstat (limited to 'tests/boot-order-test.c')
-rw-r--r--tests/boot-order-test.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/boot-order-test.c b/tests/boot-order-test.c
index 60c5545e45..508469a894 100644
--- a/tests/boot-order-test.c
+++ b/tests/boot-order-test.c
@@ -41,7 +41,7 @@ static void test_a_boot_order(const char *machine,
* system_reset only requests reset. We get a RESET event after
* the actual reset completes. Need to wait for that.
*/
- qmp_discard_response(""); /* HACK: wait for event */
+ qmp_eventwait("RESET");
actual = read_boot_order();
g_assert_cmphex(actual, ==, expected_reboot);
qtest_quit(global_qtest);