libqtest: Rename qmp_assert_error_class() to qmp_expect_error_and_unref()
PATCH 1/1 libqtest: Rename qmp_assert_error_class() to qmp_expect_error_and_unref()
qmp_assert_error_class() does more than just assert: it also unrefs the @rsp argument. Rename to qmp_assert_error_class() to reduce confusion.
--- tests/qtest/libqos/libqtest.h | 4 ++-- tests/qtest/drive_del-test.c | 2 +- tests/qtest/libqtest.c | 2 +- tests/qtest/qmp-cmd-test.c | 16 ++++++++-------- tests/qtest/qmp-test.c | 32 ++++++++++++++++---------------- tests/test-qga.c | 2 +- 6 files changed, 29 insertions(+), 29 deletions(-)
tests/qtest/libqos/libqtest.h +2 -2
@@ -704,13 +704,13 @@ void qtest_qmp_device_del(QTestState *qts, const char *id);bool qmp_rsp_is_err (QDict *rsp);/** -* qmp_assert_error_class: +* qmp_expect_error_and_unref: * @rsp: QMP response to check for error * @class: an error class * * Assert the response has the given error class and discard @rsp. */ -void qmp_assert_error_class (QDict *rsp,const char *class); +void qmp_expect_error_and_unref (QDict *rsp,const char *class);/** * qtest_probe_child:
tests/qtest/drive_del-test.c +1 -1
@@ -103,7 +103,7 @@ static void test_after_failed_device_add(void)" 'drive': 'drive0'" "}}", driver);g_assert (response); -qmp_assert_error_class (response,"GenericError" ); +qmp_expect_error_and_unref (response,"GenericError" );/* Delete the drive */ drive_del (qts);
tests/qtest/libqtest.c +1 -1
@@ -1359,7 +1359,7 @@ bool qmp_rsp_is_err(QDict *rsp)return !!error; } -void qmp_assert_error_class (QDict *rsp,const char *class) +void qmp_expect_error_and_unref (QDict *rsp,const char *class) {QDict *error =qdict_get_qdict (rsp,"error" );
tests/qtest/qmp-cmd-test.c +8 -8
@@ -210,19 +210,19 @@ static void test_object_add_failure_modes(void) resp =qtest_qmp (qts,"{'execute': 'object-add', 'arguments':" " {'qom-type': 'memory-backend-ram', 'id': 'ram1' } }" );g_assert_nonnull (resp); -qmp_assert_error_class (resp,"GenericError" ); +qmp_expect_error_and_unref (resp,"GenericError" );/* attempt to create an object without qom-type */ resp =qtest_qmp (qts,"{'execute': 'object-add', 'arguments':" " {'id': 'ram1' } }" );g_assert_nonnull (resp); -qmp_assert_error_class (resp,"GenericError" ); +qmp_expect_error_and_unref (resp,"GenericError" );/* attempt to delete an object that does not exist */ resp =qtest_qmp (qts,"{'execute': 'object-del', 'arguments':" " {'id': 'ram1' } }" );g_assert_nonnull (resp); -qmp_assert_error_class (resp,"GenericError" ); +qmp_expect_error_and_unref (resp,"GenericError" );/* attempt to create 2 objects with duplicate id */ resp = qtest_qmp(qts, "{'execute': 'object-add', 'arguments':"
@@ -236,7 +236,7 @@ static void test_object_add_failure_modes(void)" {'qom-type': 'memory-backend-ram', 'id': 'ram1'," " 'props': {'size': 1048576 } } }");g_assert_nonnull (resp); -qmp_assert_error_class (resp,"GenericError" ); +qmp_expect_error_and_unref (resp,"GenericError" );/* delete ram1 object */ resp = qtest_qmp(qts, "{'execute': 'object-del', 'arguments':"
@@ -251,7 +251,7 @@ static void test_object_add_failure_modes(void) " 'props': {'size': '1048576' } } }");g_assert_nonnull (resp);/* now do it right */ -qmp_assert_error_class (resp,"GenericError" ); +qmp_expect_error_and_unref (resp,"GenericError" ); resp =qtest_qmp (qts,"{'execute': 'object-add', 'arguments':" " {'qom-type': 'memory-backend-ram', 'id': 'ram1',"
@@ -272,7 +272,7 @@ static void test_object_add_failure_modes(void)" {'qom-type': 'memory-backend-ram'," " 'props': {'size': 1048576 } } }");g_assert_nonnull (resp); -qmp_assert_error_class (resp,"GenericError" ); +qmp_expect_error_and_unref (resp,"GenericError" );/* now do it right */ resp = qtest_qmp(qts, "{'execute': 'object-add', 'arguments':"
@@ -294,7 +294,7 @@ static void test_object_add_failure_modes(void)" {'qom-type': 'memory-backend-ram', 'id': 'ram1'," " 'props': {'sized': 1048576 } } }");g_assert_nonnull (resp); -qmp_assert_error_class (resp,"GenericError" ); +qmp_expect_error_and_unref (resp,"GenericError" );/* now do it right */ resp = qtest_qmp(qts, "{'execute': 'object-add', 'arguments':"
@@ -321,7 +321,7 @@ static void test_object_add_failure_modes(void) resp =qtest_qmp (qts,"{'execute': 'object-del', 'arguments':" " {'id': 'ram1' } }" );g_assert_nonnull (resp); -qmp_assert_error_class (resp,"GenericError" ); +qmp_expect_error_and_unref (resp,"GenericError" );qtest_quit (qts); }
tests/qtest/qmp-test.c +16 -16
@@ -38,7 +38,7 @@ static void assert_recovered(QTestState *qts)QDict *resp; resp =qtest_qmp (qts,"{ 'execute': 'no-such-cmd' }" ); -qmp_assert_error_class (resp,"CommandNotFound" ); +qmp_expect_error_and_unref (resp,"CommandNotFound" ); }static void test_malformed (QTestState *qts)
@@ -48,58 +48,58 @@ static void test_malformed(QTestState *qts)/* syntax error */ qtest_qmp_send_raw (qts,"{]\n" ); resp =qtest_qmp_receive (qts); -qmp_assert_error_class (resp,"GenericError" ); +qmp_expect_error_and_unref (resp,"GenericError" );assert_recovered (qts);/* lexical error: impossible byte outside string */ qtest_qmp_send_raw (qts,"{\xFF" ); resp =qtest_qmp_receive (qts); -qmp_assert_error_class (resp,"GenericError" ); +qmp_expect_error_and_unref (resp,"GenericError" );assert_recovered (qts);/* lexical error: funny control character outside string */ qtest_qmp_send_raw (qts,"{\x01" ); resp =qtest_qmp_receive (qts); -qmp_assert_error_class (resp,"GenericError" ); +qmp_expect_error_and_unref (resp,"GenericError" );assert_recovered (qts);/* lexical error: impossible byte in string */ qtest_qmp_send_raw (qts,"{'bad \xFF" ); resp =qtest_qmp_receive (qts); -qmp_assert_error_class (resp,"GenericError" ); +qmp_expect_error_and_unref (resp,"GenericError" );assert_recovered (qts);/* lexical error: control character in string */ qtest_qmp_send_raw (qts,"{'execute': 'nonexistent', 'id':'\n" ); resp =qtest_qmp_receive (qts); -qmp_assert_error_class (resp,"GenericError" ); +qmp_expect_error_and_unref (resp,"GenericError" );assert_recovered (qts);/* lexical error: interpolation */ qtest_qmp_send_raw (qts,"%%p" ); resp =qtest_qmp_receive (qts); -qmp_assert_error_class (resp,"GenericError" ); +qmp_expect_error_and_unref (resp,"GenericError" );assert_recovered (qts);/* Not even a dictionary */ resp =qtest_qmp (qts,"null" ); -qmp_assert_error_class (resp,"GenericError" ); +qmp_expect_error_and_unref (resp,"GenericError" );/* No "execute" key */ resp =qtest_qmp (qts,"{}" ); -qmp_assert_error_class (resp,"GenericError" ); +qmp_expect_error_and_unref (resp,"GenericError" );/* "execute" isn't a string */ resp =qtest_qmp (qts,"{ 'execute': true }" ); -qmp_assert_error_class (resp,"GenericError" ); +qmp_expect_error_and_unref (resp,"GenericError" );/* "arguments" isn't a dictionary */ resp =qtest_qmp (qts,"{ 'execute': 'no-such-cmd', 'arguments': [] }" ); -qmp_assert_error_class (resp,"GenericError" ); +qmp_expect_error_and_unref (resp,"GenericError" );/* extra key */ resp =qtest_qmp (qts,"{ 'execute': 'no-such-cmd', 'extra': true }" ); -qmp_assert_error_class (resp,"GenericError" ); +qmp_expect_error_and_unref (resp,"GenericError" ); }static void test_qmp_protocol (void )
@@ -121,7 +121,7 @@ static void test_qmp_protocol(void)/* Test valid command before handshake */ resp =qtest_qmp (qts,"{ 'execute': 'query-version' }" ); -qmp_assert_error_class (resp,"CommandNotFound" ); +qmp_expect_error_and_unref (resp,"CommandNotFound" );/* Test malformed commands before handshake */ test_malformed (qts);
@@ -134,7 +134,7 @@ static void test_qmp_protocol(void)/* Test repeated handshake */ resp =qtest_qmp (qts,"{ 'execute': 'qmp_capabilities' }" ); -qmp_assert_error_class (resp,"CommandNotFound" ); +qmp_expect_error_and_unref (resp,"CommandNotFound" );/* Test valid command */ resp =qtest_qmp (qts,"{ 'execute': 'query-version' }" );
@@ -154,7 +154,7 @@ static void test_qmp_protocol(void)/* Test command failure with 'id' */ resp =qtest_qmp (qts,"{ 'execute': 'human-monitor-command', 'id': 2 }" ); g_assert_cmpint(qdict_get_int(resp, "id"), ==, 2); -qmp_assert_error_class (resp,"GenericError" ); +qmp_expect_error_and_unref (resp,"GenericError" );qtest_quit (qts); }
@@ -327,7 +327,7 @@ static void test_qmp_missing_any_arg(void) resp =qtest_qmp (qts,"{'execute': 'qom-set', 'arguments':" " { 'path': '/machine', 'property': 'rtc-time' } }" );g_assert_nonnull (resp); -qmp_assert_error_class (resp,"GenericError" ); +qmp_expect_error_and_unref (resp,"GenericError" );qtest_quit (qts); }
tests/test-qga.c +1 -1
@@ -246,7 +246,7 @@ static void test_qga_invalid_oob(gconstpointer fix) ret =qmp_fd (fixture->fd,"{'exec-oob': 'guest-ping'}" );g_assert_nonnull (ret); -qmp_assert_error_class (ret,"GenericError" ); +qmp_expect_error_and_unref (ret,"GenericError" ); }static void test_qga_invalid_args (gconstpointer fix)
Signature · 1 line
2.26.2
Quoted 3 lines · Markus Armbruster
qmp_assert_error_class()does more than just assert: it also unrefs the @rsp argument. Rename toqmp_assert_error_class()to reduce confusion.
s/to qmp_assert_error_class()/to qmp_expect_error_and_unref()/
With that nit fixed (I can do it when picking up the patch):
Philippe Mathieu-Daudé
Reviewed-byQuoted 5 lines · Thomas Huth
Quoted 3 lines · Markus Armbruster
qmp_assert_error_class()does more than just assert: it also unrefs the @rsp argument. Rename toqmp_assert_error_class()to reduce confusion.
Quoted 7 lines
s/to qmp_assert_error_class()/to qmp_expect_error_and_unref()/
With that nit fixed (I can do it when picking up the patch):
Acked-by Thomas Huth <[email protected]>
Quoted 6 lines · Thomas Huth
Quoted 3 lines · Markus Armbruster
qmp_assert_error_class()does more than just assert: it also unrefs the @rsp argument. Rename toqmp_assert_error_class()to reduce confusion.s/to qmp_assert_error_class()/to qmp_expect_error_and_unref()/
I once again demonstrate that I'm unable to read what I wrote myself.
Quoted 3 lines
With that nit fixed (I can do it when picking up the patch):
Acked-by Thomas Huth <[email protected]>
Thanks!