Message ID | a9bbe2d090df2a88ff5d71f95ff3888873c5e4ad.1616368879.git.lukasstraub2@web.de |
---|---|
State | New |
Headers | show |
Series | yank: Add chardev tests and fixes | expand |
On Mon, Mar 22, 2021 at 3:31 AM Lukas Straub <lukasstraub2@web.de> wrote: > Add tests for yank with the chardev-change case. > > Signed-off-by: Lukas Straub <lukasstraub2@web.de> > --- > MAINTAINERS | 1 + > tests/unit/meson.build | 3 +- > tests/unit/test-yank.c | 240 +++++++++++++++++++++++++++++++++++++++++ > 3 files changed, 243 insertions(+), 1 deletion(-) > create mode 100644 tests/unit/test-yank.c > > diff --git a/MAINTAINERS b/MAINTAINERS > index aa024eed17..a8a7f0d1c2 100644 > --- a/MAINTAINERS > +++ b/MAINTAINERS > @@ -2817,6 +2817,7 @@ F: monitor/yank.c > F: stubs/yank.c > F: include/qemu/yank.h > F: qapi/yank.json > +F: tests/unit/test-yank.c > > COLO Framework > M: zhanghailiang <zhang.zhanghailiang@huawei.com> > diff --git a/tests/unit/meson.build b/tests/unit/meson.build > index 8ccf60af66..38e5dba920 100644 > --- a/tests/unit/meson.build > +++ b/tests/unit/meson.build > @@ -123,7 +123,8 @@ if have_system > 'test-util-sockets': ['socket-helpers.c'], > 'test-base64': [], > 'test-bufferiszero': [], > - 'test-vmstate': [migration, io, '../../monitor/yank.c'] > + 'test-vmstate': [migration, io, '../../monitor/yank.c'], > + 'test-yank': ['socket-helpers.c', qom, io, chardev, > '../../monitor/yank.c'] > } > if 'CONFIG_INOTIFY1' in config_host > tests += {'test-util-filemonitor': []} > diff --git a/tests/unit/test-yank.c b/tests/unit/test-yank.c > new file mode 100644 > index 0000000000..44f24c45a8 > --- /dev/null > +++ b/tests/unit/test-yank.c > @@ -0,0 +1,240 @@ > +#include "qemu/osdep.h" > +#include <glib/gstdio.h> > + > +#include "qemu/config-file.h" > +#include "qemu/module.h" > +#include "qemu/option.h" > +#include "qemu/sockets.h" > +#include "chardev/char-fe.h" > +#include "sysemu/sysemu.h" > +#include "qapi/error.h" > +#include "qapi/qapi-commands-char.h" > +#include "qapi/qmp/qdict.h" > +#include "qom/qom-qobject.h" > +#include "io/channel-socket.h" > +#include "qapi/qobject-input-visitor.h" > +#include "qapi/qapi-visit-sockets.h" > +#include "socket-helpers.h" > +#include "qapi/qapi-commands-yank.h" > +#include "qapi/qapi-types-yank.h" > + > +static int chardev_change(void *opaque) > +{ > + return 0; > +} > + > +static bool is_yank_instance_registered(void) > +{ > + YankInstanceList *list; > + bool ret; > + > + list = qmp_query_yank(&error_abort); > + > + ret = !!list; > + > + qapi_free_YankInstanceList(list); > + > + return ret; > +} > + > +static void char_change_to_yank_test(gconstpointer opaque) > +{ > + SocketAddress *addr = (gpointer) opaque; > + Chardev *chr; > + CharBackend be; > + ChardevReturn *ret; > + QIOChannelSocket *ioc; > + > + /* > + * Setup a listener socket and determine its address > + * so we know the TCP port for the client later > + */ > + ioc = qio_channel_socket_new(); > + g_assert_nonnull(ioc); > + qio_channel_socket_listen_sync(ioc, addr, 1, &error_abort); > + addr = qio_channel_socket_get_local_address(ioc, &error_abort); > + g_assert_nonnull(addr); > + > + ChardevBackend old_backend = { .type = CHARDEV_BACKEND_KIND_NULL }; > + ChardevBackend new_backend = { > + .type = CHARDEV_BACKEND_KIND_SOCKET, > + .u.socket.data = &(ChardevSocket) { > + .addr = &(SocketAddressLegacy) { > + .type = SOCKET_ADDRESS_LEGACY_KIND_INET, > + .u.inet.data = &addr->u.inet > + }, > + .has_server = true, > + .server = false > + } }; > + > It looks like you should be able to factorize the code with a common function: test_yank_change(first, second, first_registerd, second_registered) or something like that. thanks + g_assert(!is_yank_instance_registered()); > + > + ret = qmp_chardev_add("chardev", &old_backend, &error_abort); > + qapi_free_ChardevReturn(ret); > + chr = qemu_chr_find("chardev"); > + g_assert_nonnull(chr); > + > + g_assert(!is_yank_instance_registered()); > + > + qemu_chr_wait_connected(chr, &error_abort); > + qemu_chr_fe_init(&be, chr, &error_abort); > + /* allow chardev-change */ > + qemu_chr_fe_set_handlers(&be, NULL, NULL, > + NULL, chardev_change, NULL, NULL, true); > + > + ret = qmp_chardev_change("chardev", &new_backend, &error_abort); > + g_assert_nonnull(ret); > + g_assert(be.chr != chr); > + g_assert(is_yank_instance_registered()); > + > + object_unparent(OBJECT(be.chr)); > + object_unref(OBJECT(ioc)); > + qapi_free_ChardevReturn(ret); > +} > + > +static void char_change_yank_to_yank_test(gconstpointer opaque) > +{ > + SocketAddress *addr = (gpointer) opaque; > + Chardev *chr; > + CharBackend be; > + ChardevReturn *ret; > + QIOChannelSocket *ioc; > + > + /* > + * Setup a listener socket and determine its address > + * so we know the TCP port for the client later > + */ > + ioc = qio_channel_socket_new(); > + g_assert_nonnull(ioc); > + qio_channel_socket_listen_sync(ioc, addr, 1, &error_abort); > + addr = qio_channel_socket_get_local_address(ioc, &error_abort); > + g_assert_nonnull(addr); > + > + ChardevBackend backend = { > + .type = CHARDEV_BACKEND_KIND_SOCKET, > + .u.socket.data = &(ChardevSocket) { > + .addr = &(SocketAddressLegacy) { > + .type = SOCKET_ADDRESS_LEGACY_KIND_INET, > + .u.inet.data = &addr->u.inet > + }, > + .has_server = true, > + .server = false > + } }; > + > + g_assert(!is_yank_instance_registered()); > + > + ret = qmp_chardev_add("chardev", &backend, &error_abort); > + qapi_free_ChardevReturn(ret); > + chr = qemu_chr_find("chardev"); > + g_assert_nonnull(chr); > + > + g_assert(is_yank_instance_registered()); > + > + qemu_chr_wait_connected(chr, &error_abort); > + qemu_chr_fe_init(&be, chr, &error_abort); > + /* allow chardev-change */ > + qemu_chr_fe_set_handlers(&be, NULL, NULL, > + NULL, chardev_change, NULL, NULL, true); > + > + ret = qmp_chardev_change("chardev", &backend, &error_abort); > + g_assert_nonnull(ret); > + g_assert(be.chr != chr); > + g_assert(is_yank_instance_registered()); > + > + object_unparent(OBJECT(be.chr)); > + object_unref(OBJECT(ioc)); > + qapi_free_ChardevReturn(ret); > +} > + > +static void char_change_from_yank_test(gconstpointer opaque) > +{ > + SocketAddress *addr = (gpointer) opaque; > + Chardev *chr; > + CharBackend be; > + ChardevReturn *ret; > + QIOChannelSocket *ioc; > + > + /* > + * Setup a listener socket and determine its address > + * so we know the TCP port for the client later > + */ > + ioc = qio_channel_socket_new(); > + g_assert_nonnull(ioc); > + qio_channel_socket_listen_sync(ioc, addr, 1, &error_abort); > + addr = qio_channel_socket_get_local_address(ioc, &error_abort); > + g_assert_nonnull(addr); > + > + ChardevBackend old_backend = { > + .type = CHARDEV_BACKEND_KIND_SOCKET, > + .u.socket.data = &(ChardevSocket) { > + .addr = &(SocketAddressLegacy) { > + .type = SOCKET_ADDRESS_LEGACY_KIND_INET, > + .u.inet.data = &addr->u.inet > + }, > + .has_server = true, > + .server = false > + } }; > + ChardevBackend new_backend = { .type = CHARDEV_BACKEND_KIND_NULL }; > + > + g_assert(!is_yank_instance_registered()); > + > + ret = qmp_chardev_add("chardev", &old_backend, &error_abort); > + qapi_free_ChardevReturn(ret); > + chr = qemu_chr_find("chardev"); > + g_assert_nonnull(chr); > + > + g_assert(is_yank_instance_registered()); > + > + qemu_chr_wait_connected(chr, &error_abort); > + qemu_chr_fe_init(&be, chr, &error_abort); > + /* allow chardev-change */ > + qemu_chr_fe_set_handlers(&be, NULL, NULL, > + NULL, chardev_change, NULL, NULL, true); > + > + ret = qmp_chardev_change("chardev", &new_backend, &error_abort); > + g_assert_nonnull(ret); > + g_assert(be.chr != chr); > + g_assert(!is_yank_instance_registered()); > + > + object_unparent(OBJECT(be.chr)); > + object_unref(OBJECT(ioc)); > + qapi_free_ChardevReturn(ret); > +} > + > +static SocketAddress tcpaddr = { > + .type = SOCKET_ADDRESS_TYPE_INET, > + .u.inet.host = (char *)"127.0.0.1", > + .u.inet.port = (char *)"0", > +}; > + > +int main(int argc, char **argv) > +{ > + bool has_ipv4, has_ipv6; > + > + qemu_init_main_loop(&error_abort); > + socket_init(); > + > + g_test_init(&argc, &argv, NULL); > + > + if (socket_check_protocol_support(&has_ipv4, &has_ipv6) < 0) { > + g_printerr("socket_check_protocol_support() failed\n"); > + goto end; > + } > + > + if (!has_ipv4) { > + goto end; > + } > + > + module_call_init(MODULE_INIT_QOM); > + qemu_add_opts(&qemu_chardev_opts); > + > + g_test_add_data_func("/yank/char_change_to_yank", &tcpaddr, > + char_change_to_yank_test); > + g_test_add_data_func("/yank/char_change_yank_to_yank", &tcpaddr, > + char_change_yank_to_yank_test); > + g_test_add_data_func("/yank/char_change_from_yank", &tcpaddr, > + char_change_from_yank_test); > + > +end: > + return g_test_run(); > +} > -- > 2.30.2 > >
diff --git a/MAINTAINERS b/MAINTAINERS index aa024eed17..a8a7f0d1c2 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -2817,6 +2817,7 @@ F: monitor/yank.c F: stubs/yank.c F: include/qemu/yank.h F: qapi/yank.json +F: tests/unit/test-yank.c COLO Framework M: zhanghailiang <zhang.zhanghailiang@huawei.com> diff --git a/tests/unit/meson.build b/tests/unit/meson.build index 8ccf60af66..38e5dba920 100644 --- a/tests/unit/meson.build +++ b/tests/unit/meson.build @@ -123,7 +123,8 @@ if have_system 'test-util-sockets': ['socket-helpers.c'], 'test-base64': [], 'test-bufferiszero': [], - 'test-vmstate': [migration, io, '../../monitor/yank.c'] + 'test-vmstate': [migration, io, '../../monitor/yank.c'], + 'test-yank': ['socket-helpers.c', qom, io, chardev, '../../monitor/yank.c'] } if 'CONFIG_INOTIFY1' in config_host tests += {'test-util-filemonitor': []} diff --git a/tests/unit/test-yank.c b/tests/unit/test-yank.c new file mode 100644 index 0000000000..44f24c45a8 --- /dev/null +++ b/tests/unit/test-yank.c @@ -0,0 +1,240 @@ +#include "qemu/osdep.h" +#include <glib/gstdio.h> + +#include "qemu/config-file.h" +#include "qemu/module.h" +#include "qemu/option.h" +#include "qemu/sockets.h" +#include "chardev/char-fe.h" +#include "sysemu/sysemu.h" +#include "qapi/error.h" +#include "qapi/qapi-commands-char.h" +#include "qapi/qmp/qdict.h" +#include "qom/qom-qobject.h" +#include "io/channel-socket.h" +#include "qapi/qobject-input-visitor.h" +#include "qapi/qapi-visit-sockets.h" +#include "socket-helpers.h" +#include "qapi/qapi-commands-yank.h" +#include "qapi/qapi-types-yank.h" + +static int chardev_change(void *opaque) +{ + return 0; +} + +static bool is_yank_instance_registered(void) +{ + YankInstanceList *list; + bool ret; + + list = qmp_query_yank(&error_abort); + + ret = !!list; + + qapi_free_YankInstanceList(list); + + return ret; +} + +static void char_change_to_yank_test(gconstpointer opaque) +{ + SocketAddress *addr = (gpointer) opaque; + Chardev *chr; + CharBackend be; + ChardevReturn *ret; + QIOChannelSocket *ioc; + + /* + * Setup a listener socket and determine its address + * so we know the TCP port for the client later + */ + ioc = qio_channel_socket_new(); + g_assert_nonnull(ioc); + qio_channel_socket_listen_sync(ioc, addr, 1, &error_abort); + addr = qio_channel_socket_get_local_address(ioc, &error_abort); + g_assert_nonnull(addr); + + ChardevBackend old_backend = { .type = CHARDEV_BACKEND_KIND_NULL }; + ChardevBackend new_backend = { + .type = CHARDEV_BACKEND_KIND_SOCKET, + .u.socket.data = &(ChardevSocket) { + .addr = &(SocketAddressLegacy) { + .type = SOCKET_ADDRESS_LEGACY_KIND_INET, + .u.inet.data = &addr->u.inet + }, + .has_server = true, + .server = false + } }; + + g_assert(!is_yank_instance_registered()); + + ret = qmp_chardev_add("chardev", &old_backend, &error_abort); + qapi_free_ChardevReturn(ret); + chr = qemu_chr_find("chardev"); + g_assert_nonnull(chr); + + g_assert(!is_yank_instance_registered()); + + qemu_chr_wait_connected(chr, &error_abort); + qemu_chr_fe_init(&be, chr, &error_abort); + /* allow chardev-change */ + qemu_chr_fe_set_handlers(&be, NULL, NULL, + NULL, chardev_change, NULL, NULL, true); + + ret = qmp_chardev_change("chardev", &new_backend, &error_abort); + g_assert_nonnull(ret); + g_assert(be.chr != chr); + g_assert(is_yank_instance_registered()); + + object_unparent(OBJECT(be.chr)); + object_unref(OBJECT(ioc)); + qapi_free_ChardevReturn(ret); +} + +static void char_change_yank_to_yank_test(gconstpointer opaque) +{ + SocketAddress *addr = (gpointer) opaque; + Chardev *chr; + CharBackend be; + ChardevReturn *ret; + QIOChannelSocket *ioc; + + /* + * Setup a listener socket and determine its address + * so we know the TCP port for the client later + */ + ioc = qio_channel_socket_new(); + g_assert_nonnull(ioc); + qio_channel_socket_listen_sync(ioc, addr, 1, &error_abort); + addr = qio_channel_socket_get_local_address(ioc, &error_abort); + g_assert_nonnull(addr); + + ChardevBackend backend = { + .type = CHARDEV_BACKEND_KIND_SOCKET, + .u.socket.data = &(ChardevSocket) { + .addr = &(SocketAddressLegacy) { + .type = SOCKET_ADDRESS_LEGACY_KIND_INET, + .u.inet.data = &addr->u.inet + }, + .has_server = true, + .server = false + } }; + + g_assert(!is_yank_instance_registered()); + + ret = qmp_chardev_add("chardev", &backend, &error_abort); + qapi_free_ChardevReturn(ret); + chr = qemu_chr_find("chardev"); + g_assert_nonnull(chr); + + g_assert(is_yank_instance_registered()); + + qemu_chr_wait_connected(chr, &error_abort); + qemu_chr_fe_init(&be, chr, &error_abort); + /* allow chardev-change */ + qemu_chr_fe_set_handlers(&be, NULL, NULL, + NULL, chardev_change, NULL, NULL, true); + + ret = qmp_chardev_change("chardev", &backend, &error_abort); + g_assert_nonnull(ret); + g_assert(be.chr != chr); + g_assert(is_yank_instance_registered()); + + object_unparent(OBJECT(be.chr)); + object_unref(OBJECT(ioc)); + qapi_free_ChardevReturn(ret); +} + +static void char_change_from_yank_test(gconstpointer opaque) +{ + SocketAddress *addr = (gpointer) opaque; + Chardev *chr; + CharBackend be; + ChardevReturn *ret; + QIOChannelSocket *ioc; + + /* + * Setup a listener socket and determine its address + * so we know the TCP port for the client later + */ + ioc = qio_channel_socket_new(); + g_assert_nonnull(ioc); + qio_channel_socket_listen_sync(ioc, addr, 1, &error_abort); + addr = qio_channel_socket_get_local_address(ioc, &error_abort); + g_assert_nonnull(addr); + + ChardevBackend old_backend = { + .type = CHARDEV_BACKEND_KIND_SOCKET, + .u.socket.data = &(ChardevSocket) { + .addr = &(SocketAddressLegacy) { + .type = SOCKET_ADDRESS_LEGACY_KIND_INET, + .u.inet.data = &addr->u.inet + }, + .has_server = true, + .server = false + } }; + ChardevBackend new_backend = { .type = CHARDEV_BACKEND_KIND_NULL }; + + g_assert(!is_yank_instance_registered()); + + ret = qmp_chardev_add("chardev", &old_backend, &error_abort); + qapi_free_ChardevReturn(ret); + chr = qemu_chr_find("chardev"); + g_assert_nonnull(chr); + + g_assert(is_yank_instance_registered()); + + qemu_chr_wait_connected(chr, &error_abort); + qemu_chr_fe_init(&be, chr, &error_abort); + /* allow chardev-change */ + qemu_chr_fe_set_handlers(&be, NULL, NULL, + NULL, chardev_change, NULL, NULL, true); + + ret = qmp_chardev_change("chardev", &new_backend, &error_abort); + g_assert_nonnull(ret); + g_assert(be.chr != chr); + g_assert(!is_yank_instance_registered()); + + object_unparent(OBJECT(be.chr)); + object_unref(OBJECT(ioc)); + qapi_free_ChardevReturn(ret); +} + +static SocketAddress tcpaddr = { + .type = SOCKET_ADDRESS_TYPE_INET, + .u.inet.host = (char *)"127.0.0.1", + .u.inet.port = (char *)"0", +}; + +int main(int argc, char **argv) +{ + bool has_ipv4, has_ipv6; + + qemu_init_main_loop(&error_abort); + socket_init(); + + g_test_init(&argc, &argv, NULL); + + if (socket_check_protocol_support(&has_ipv4, &has_ipv6) < 0) { + g_printerr("socket_check_protocol_support() failed\n"); + goto end; + } + + if (!has_ipv4) { + goto end; + } + + module_call_init(MODULE_INIT_QOM); + qemu_add_opts(&qemu_chardev_opts); + + g_test_add_data_func("/yank/char_change_to_yank", &tcpaddr, + char_change_to_yank_test); + g_test_add_data_func("/yank/char_change_yank_to_yank", &tcpaddr, + char_change_yank_to_yank_test); + g_test_add_data_func("/yank/char_change_from_yank", &tcpaddr, + char_change_from_yank_test); + +end: + return g_test_run(); +}
Add tests for yank with the chardev-change case. Signed-off-by: Lukas Straub <lukasstraub2@web.de> --- MAINTAINERS | 1 + tests/unit/meson.build | 3 +- tests/unit/test-yank.c | 240 +++++++++++++++++++++++++++++++++++++++++ 3 files changed, 243 insertions(+), 1 deletion(-) create mode 100644 tests/unit/test-yank.c -- 2.30.2