tests/migration: Do not use functions anymore that rely on global_qtest
PATCH 1/1 tests/migration: Do not use functions anymore that rely on global_qtest
The migration tests deal with multiple test states, so we really should not use functions here that rely on the single global_qtest variable. Switch from qtest_start() to qtest_init() to make sure that global_qtest is not set anymore. This also revealed a regression in the migrate()
function: It has once been converted to use the qtest_qmp() function, but commit b5bbd3f315d686bd511 ("Clean up string interpolation into QMP, part 2") accidentally reverted it back to qmp().
--- tests/migration-test.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
tests/migration-test.c +3 -3
@@ -490,7 +490,7 @@ static void migrate(QTestState *who, const char *uri, const char *fmt, ...)g_assert (!qdict_haskey (args,"uri" ));qdict_put_str (args,"uri" , uri); - rsp =qmp ("{ 'execute': 'migrate', 'arguments': %p}" , args); + rsp =qtest_qmp (who,"{ 'execute': 'migrate', 'arguments': %p}" , args);g_assert (qdict_haskey (rsp,"return" ));qobject_unref (rsp);
@@ -625,7 +625,7 @@ static int test_migrate_start(QTestState **from, QTestState **to, cmd_dst = tmp; } - *from =qtest_start (cmd_src); + *from =qtest_init (cmd_src);g_free (cmd_src); *to =qtest_init (cmd_dst);
@@ -715,7 +715,7 @@ static void test_deprecated(void) {QTestState *from; - from =qtest_start ("-machine none" ); + from =qtest_init ("-machine none" );deprecated_set_downtime (from,0.12345 );deprecated_set_speed (from,12345 );
Signature · 1 line
2.18.1
Quoted 9 lines · * Thomas Huth ([email protected]) wrote:
The migration tests deal with multiple test states, so we really should not use functions here that rely on the single
global_qtestvariable. Switch fromqtest_start()toqtest_init()to make sure thatglobal_qtestis not set anymore. This also revealed a regression in themigrate()
function: It has once been converted to use theqtest_qmp()function, but commitb5bbd3f315d686bd511("Clean up string interpolation into QMP, part 2") accidentally reverted it back toqmp().Signed-off-by Thomas Huth <[email protected]>
Quoted 9 lines
--- tests/migration-test.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)tests/migration-test.c +0
-0
tests/migration-test.c static void migrate(QTestState *who, const char *uri, const char *fmt, ...) · line 493
Quoted 5 lines
tests/migration-test.c +1
-1@@ -490,7 +490,7 @@ static void migrate(QTestState *who, const char *uri, const char *fmt, ...)g_assert (!qdict_haskey (args,"uri" ));qdict_put_str (args,"uri" , uri); - rsp =qmp ("{ 'execute': 'migrate', 'arguments': %p}" , args); + rsp =qtest_qmp (who,"{ 'execute': 'migrate', 'arguments': %p}" , args);
It took me some time to figure out what %p really meant since libqtest.h tells me to see the non-existent parse_escape, which is actually parse_interpolation.
Dave
Quoted 23 lines
tests/migration-test.c +2
-2g_assert (qdict_haskey (rsp,"return" ));qobject_unref (rsp);@@ -625,7 +625,7 @@ static int test_migrate_start(QTestState **from, QTestState **to, cmd_dst = tmp; } - *from =qtest_start (cmd_src); + *from =qtest_init (cmd_src);g_free (cmd_src); *to =qtest_init (cmd_dst);@@ -715,7 +715,7 @@ static void test_deprecated(void) {QTestState *from; - from =qtest_start ("-machine none" ); + from =qtest_init ("-machine none" );deprecated_set_downtime (from,0.12345 );deprecated_set_speed (from,12345 );Signature · 1 line
2.18.1
--
Dr. David Alan Gilbert / [email protected] / Manchester, UK