[v4,2/4] tests: Add tests for query-netdev command

Commit Message

Alexey Kirillov Sept. 21, 2020, 7:19 p.m. UTC

Signed-off-by: Alexey Kirillov <[e-mail]>
---
 tests/qtest/meson.build         |   3 +
 tests/qtest/test-query-netdev.c | 115 ++++++++++++++++++++++++++++++++
 2 files changed, 118 insertions(+)
 create mode 100644 tests/qtest/test-query-netdev.c

Comments

Thomas Huth Oct. 24, 2020, 7:07 a.m. UTC | #1

On 21/09/2020 21.19, Alexey Kirillov wrote:
> Signed-off-by: Alexey Kirillov <[e-mail]>
> ---
>  tests/qtest/meson.build         |   3 +
>  tests/qtest/test-query-netdev.c | 115 ++++++++++++++++++++++++++++++++
>  2 files changed, 118 insertions(+)
>  create mode 100644 tests/qtest/test-query-netdev.c
[...]
> +static void test_query_netdev(void)
> +{
> +    const char *arch = qtest_get_arch();
> +    QObject *resp;
> +    QTestState *state;
> +
> +    /* Skip test for some MCU */
> +    if (g_str_equal(arch, "avr") ||
> +        g_str_equal(arch, "rx")) {
> +        return;
> +    }
> +
> +    if (g_str_equal(arch, "arm") ||
> +        g_str_equal(arch, "aarch64")) {
> +        state = qtest_init(
> +            "-nodefaults "
> +            "-M virt "
> +            "-netdev user,id=slirp0");
> +    } else if (g_str_equal(arch, "tricore")) {
> +        state = qtest_init(
> +            "-nodefaults "
> +            "-M tricore_testboard "
> +            "-netdev user,id=slirp0");
> +    } else {
> +        state = qtest_init(
> +            "-nodefaults "
> +            "-netdev user,id=slirp0");
> +    }
> +    g_assert(state);

Have you tried manually selecting a machine for the avr and rx targets? It
worked with the iotests, see commit
733dafe4914ef2e6d6a9d546b7fdbb429f3590e7, i.e. on avr you could try "-M
mega2560" and on rx you could try "-M gdbsim-r5f562n8".

> +    qmp_query_netdev_no_error(state, 1);
> +
> +    resp = wait_command(state,
> +        "{'execute': 'netdev_add', 'arguments': {"
> +        " 'id': 'slirp1',"
> +        " 'type': 'user'}}");
> +    qobject_unref(resp);
> +
> +    qmp_query_netdev_no_error(state, 2);
> +
> +    resp = wait_command(state,
> +        "{'execute': 'netdev_del', 'arguments': {"
> +        " 'id': 'slirp1'}}");
> +    qobject_unref(resp);
> +
> +    qmp_query_netdev_no_error(state, 1);
> +
> +    qtest_quit(state);
> +}
> +
> +int main(int argc, char **argv)
> +{
> +    int ret = 0;
> +    g_test_init(&argc, &argv, NULL);
> +
> +    qtest_add_func("/net/qapi/query_netdev", test_query_netdev);
> +
> +    ret = g_test_run();
> +
> +    return ret;
> +}
> 

Acked-by: Thomas Huth <[e-mail]>

Patch

diff --git a/tests/qtest/meson.build b/tests/qtest/meson.build
index 874b5be62b..826eef49e0 100644
--- a/tests/qtest/meson.build
+++ b/tests/qtest/meson.build
@@ -17,6 +17,9 @@  qtests_generic = [
 if config_host.has_key('CONFIG_MODULES')
   qtests_generic += [ 'modules-test' ]
 endif
+if config_host.has_key('CONFIG_SLIRP')
+  qtests_generic += [ 'test-query-netdev' ]
+endif
 
 qtests_pci = \
   (config_all_devices.has_key('CONFIG_VGA') ? ['display-vga-test'] : []) +                  \
diff --git a/tests/qtest/test-query-netdev.c b/tests/qtest/test-query-netdev.c
new file mode 100644
index 0000000000..9526316983
--- /dev/null
+++ b/tests/qtest/test-query-netdev.c
@@ -0,0 +1,115 @@ 
+/*
+ * QTest testcase for the query-netdev
+ *
+ * Copyright Yandex N.V., 2019
+ *
+ * This work is licensed under the terms of the GNU GPL, version 2 or later.
+ * See the COPYING file in the top-level directory.
+ *
+ */
+
+#include "qemu/osdep.h"
+
+#include "libqos/libqtest.h"
+#include "qapi/qmp/qdict.h"
+#include "qapi/qmp/qlist.h"
+
+/*
+ * Events can get in the way of responses we are actually waiting for.
+ */
+GCC_FMT_ATTR(2, 3)
+static QObject *wait_command(QTestState *who, const char *command, ...)
+{
+    va_list ap;
+    QDict *response;
+    QObject *result;
+
+    va_start(ap, command);
+    qtest_qmp_vsend(who, command, ap);
+    va_end(ap);
+
+    response = qtest_qmp_receive(who);
+
+    result = qdict_get(response, "return");
+    g_assert(result);
+    qobject_ref(result);
+    qobject_unref(response);
+
+    return result;
+}
+
+static void qmp_query_netdev_no_error(QTestState *qts, size_t netdevs_count)
+{
+    QObject *resp;
+    QList *netdevs;
+
+    resp = wait_command(qts, "{'execute': 'query-netdev'}");
+
+    netdevs = qobject_to(QList, resp);
+    g_assert(netdevs);
+    g_assert(qlist_size(netdevs) == netdevs_count);
+
+    qobject_unref(resp);
+}
+
+static void test_query_netdev(void)
+{
+    const char *arch = qtest_get_arch();
+    QObject *resp;
+    QTestState *state;
+
+    /* Skip test for some MCU */
+    if (g_str_equal(arch, "avr") ||
+        g_str_equal(arch, "rx")) {
+        return;
+    }
+
+    if (g_str_equal(arch, "arm") ||
+        g_str_equal(arch, "aarch64")) {
+        state = qtest_init(
+            "-nodefaults "
+            "-M virt "
+            "-netdev user,id=slirp0");
+    } else if (g_str_equal(arch, "tricore")) {
+        state = qtest_init(
+            "-nodefaults "
+            "-M tricore_testboard "
+            "-netdev user,id=slirp0");
+    } else {
+        state = qtest_init(
+            "-nodefaults "
+            "-netdev user,id=slirp0");
+    }
+    g_assert(state);
+
+    qmp_query_netdev_no_error(state, 1);
+
+    resp = wait_command(state,
+        "{'execute': 'netdev_add', 'arguments': {"
+        " 'id': 'slirp1',"
+        " 'type': 'user'}}");
+    qobject_unref(resp);
+
+    qmp_query_netdev_no_error(state, 2);
+
+    resp = wait_command(state,
+        "{'execute': 'netdev_del', 'arguments': {"
+        " 'id': 'slirp1'}}");
+    qobject_unref(resp);
+
+    qmp_query_netdev_no_error(state, 1);
+
+    qtest_quit(state);
+}
+
+int main(int argc, char **argv)
+{
+    int ret = 0;
+    g_test_init(&argc, &argv, NULL);
+
+    qtest_add_func("/net/qapi/query_netdev", test_query_netdev);
+
+    ret = g_test_run();
+
+    return ret;
+}