[v2,3/3] tests/qtest: Re-enable multifd cancel test

Commit Message

Fabiano Rosas June 7, 2023, 4:13 p.m. UTC

We've found the source of flakiness in this test, so re-enable it.

Reviewed-by: Juan Quintela <[e-mail]>
Signed-off-by: Fabiano Rosas <[e-mail]>
---
 tests/qtest/migration-test.c | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

Comments

Juan Quintela June 9, 2023, 10:30 a.m. UTC | #1

Fabiano Rosas <[e-mail]> wrote:
> We've found the source of flakiness in this test, so re-enable it.
>
> Reviewed-by: Juan Quintela <[e-mail]>
> Signed-off-by: Fabiano Rosas <[e-mail]>

See my series sent yesterday.

Your fix is necesary, but we still have another failure.  If it takes
too long for "to" guest to die we could be waiting on the wrong
"dst_serial".  See my series that I sent yesterday that fixes this.

Queueding patch 1 and 2 for next PULL, waiting until my series get
reviewed to put this one.

Later, Juan.

Patch

diff --git a/tests/qtest/migration-test.c b/tests/qtest/migration-test.c
index b0c355bbd9..800ad23b75 100644
--- a/tests/qtest/migration-test.c
+++ b/tests/qtest/migration-test.c
@@ -2778,14 +2778,8 @@  int main(int argc, char **argv)
     }
     qtest_add_func("/migration/multifd/tcp/plain/none",
                    test_multifd_tcp_none);
-    /*
-     * This test is flaky and sometimes fails in CI and otherwise:
-     * don't run unless user opts in via environment variable.
-     */
-    if (getenv("QEMU_TEST_FLAKY_TESTS")) {
-        qtest_add_func("/migration/multifd/tcp/plain/cancel",
-                       test_multifd_tcp_cancel);
-    }
+    qtest_add_func("/migration/multifd/tcp/plain/cancel",
+                   test_multifd_tcp_cancel);
     qtest_add_func("/migration/multifd/tcp/plain/zlib",
                    test_multifd_tcp_zlib);
 #ifdef CONFIG_ZSTD