[PATCH v4 7/7] tests/qtest/vhost-user-test: enable the reconnect tests

Dima Stepanov posted 7 patches 5 years, 5 months ago
Maintainers: "Michael S. Tsirkin" <mst@redhat.com>, Laurent Vivier <lvivier@redhat.com>, Kevin Wolf <kwolf@redhat.com>, Paolo Bonzini <pbonzini@redhat.com>, Thomas Huth <thuth@redhat.com>, Raphael Norwitz <raphael.norwitz@nutanix.com>, Max Reitz <mreitz@redhat.com>
There is a newer version of this series
[PATCH v4 7/7] tests/qtest/vhost-user-test: enable the reconnect tests
Posted by Dima Stepanov 5 years, 5 months ago
For now a QTEST_VHOST_USER_FIXME environment variable is used to
separate reconnect tests for the vhost-user-net device. Looks like the
reconnect functionality is pretty stable, so this separation is
deprecated.
Remove it and enable these tests for the default run.

Signed-off-by: Dima Stepanov <dimastep@yandex-team.ru>
---
 tests/qtest/vhost-user-test.c | 25 +++++++++++--------------
 1 file changed, 11 insertions(+), 14 deletions(-)

diff --git a/tests/qtest/vhost-user-test.c b/tests/qtest/vhost-user-test.c
index 4b715d3..4b96312 100644
--- a/tests/qtest/vhost-user-test.c
+++ b/tests/qtest/vhost-user-test.c
@@ -1140,20 +1140,17 @@ static void register_vhost_user_test(void)
                  "virtio-net",
                  test_migrate, &opts);
 
-    /* keeps failing on build-system since Aug 15 2017 */
-    if (getenv("QTEST_VHOST_USER_FIXME")) {
-        opts.before = vhost_user_test_setup_reconnect;
-        qos_add_test("vhost-user/reconnect", "virtio-net",
-                     test_reconnect, &opts);
-
-        opts.before = vhost_user_test_setup_connect_fail;
-        qos_add_test("vhost-user/connect-fail", "virtio-net",
-                     test_vhost_user_started, &opts);
-
-        opts.before = vhost_user_test_setup_flags_mismatch;
-        qos_add_test("vhost-user/flags-mismatch", "virtio-net",
-                     test_vhost_user_started, &opts);
-    }
+    opts.before = vhost_user_test_setup_reconnect;
+    qos_add_test("vhost-user/reconnect", "virtio-net",
+                 test_reconnect, &opts);
+
+    opts.before = vhost_user_test_setup_connect_fail;
+    qos_add_test("vhost-user/connect-fail", "virtio-net",
+                 test_vhost_user_started, &opts);
+
+    opts.before = vhost_user_test_setup_flags_mismatch;
+    qos_add_test("vhost-user/flags-mismatch", "virtio-net",
+                 test_vhost_user_started, &opts);
 
     opts.before = vhost_user_test_setup_multiqueue;
     opts.edge.extra_device_opts = "mq=on";
-- 
2.7.4


Re: [PATCH v4 7/7] tests/qtest/vhost-user-test: enable the reconnect tests
Posted by Raphael Norwitz 5 years, 5 months ago
This works for me, and looks good, but I figure those who added the
check should confirm that these tests are reliable now.

Marc-Andre - thoughts?

On Fri, Sep 4, 2020 at 5:36 AM Dima Stepanov <dimastep@yandex-team.ru> wrote:
>
> For now a QTEST_VHOST_USER_FIXME environment variable is used to
> separate reconnect tests for the vhost-user-net device. Looks like the
> reconnect functionality is pretty stable, so this separation is
> deprecated.
> Remove it and enable these tests for the default run.
>
> Signed-off-by: Dima Stepanov <dimastep@yandex-team.ru>
> ---
>  tests/qtest/vhost-user-test.c | 25 +++++++++++--------------
>  1 file changed, 11 insertions(+), 14 deletions(-)
>
> diff --git a/tests/qtest/vhost-user-test.c b/tests/qtest/vhost-user-test.c
> index 4b715d3..4b96312 100644
> --- a/tests/qtest/vhost-user-test.c
> +++ b/tests/qtest/vhost-user-test.c
> @@ -1140,20 +1140,17 @@ static void register_vhost_user_test(void)
>                   "virtio-net",
>                   test_migrate, &opts);
>
> -    /* keeps failing on build-system since Aug 15 2017 */
> -    if (getenv("QTEST_VHOST_USER_FIXME")) {
> -        opts.before = vhost_user_test_setup_reconnect;
> -        qos_add_test("vhost-user/reconnect", "virtio-net",
> -                     test_reconnect, &opts);
> -
> -        opts.before = vhost_user_test_setup_connect_fail;
> -        qos_add_test("vhost-user/connect-fail", "virtio-net",
> -                     test_vhost_user_started, &opts);
> -
> -        opts.before = vhost_user_test_setup_flags_mismatch;
> -        qos_add_test("vhost-user/flags-mismatch", "virtio-net",
> -                     test_vhost_user_started, &opts);
> -    }
> +    opts.before = vhost_user_test_setup_reconnect;
> +    qos_add_test("vhost-user/reconnect", "virtio-net",
> +                 test_reconnect, &opts);
> +
> +    opts.before = vhost_user_test_setup_connect_fail;
> +    qos_add_test("vhost-user/connect-fail", "virtio-net",
> +                 test_vhost_user_started, &opts);
> +
> +    opts.before = vhost_user_test_setup_flags_mismatch;
> +    qos_add_test("vhost-user/flags-mismatch", "virtio-net",
> +                 test_vhost_user_started, &opts);
>
>      opts.before = vhost_user_test_setup_multiqueue;
>      opts.edge.extra_device_opts = "mq=on";
> --
> 2.7.4
>
>