From e25636a12a1cc0a136aaa611a0cfbe6ebfa4aed4 Mon Sep 17 00:00:00 2001 From: Thomas Huth Date: Mon, 22 Aug 2022 17:56:04 +0100 Subject: tests/qtest/migration-test: Only wait for serial output where migration succeeds MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Waiting for the serial output can take a couple of seconds - and since we're doing a lot of migration tests, this time easily sums up to multiple minutes. But if a test is supposed to fail, it does not make much sense to wait for the source to be in the right state first, so we can skip the waiting here. This way we can speed up all tests where the migration is supposed to fail. In the gitlab-CI gprov-gcov test, each of the migration-tests now run two minutes faster! Reviewed-by: Dr. David Alan Gilbert Signed-off-by: Thomas Huth Message-Id: <20220819053802.296584-2-thuth@redhat.com> Signed-off-by: Alex Bennée Reviewed-by: Juan Quintela Message-Id: <20220822165608.2980552-3-alex.bennee@linaro.org> --- tests/qtest/migration-test.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'tests/qtest/migration-test.c') diff --git a/tests/qtest/migration-test.c b/tests/qtest/migration-test.c index 520a5f9..7be321b 100644 --- a/tests/qtest/migration-test.c +++ b/tests/qtest/migration-test.c @@ -1307,7 +1307,9 @@ static void test_precopy_common(MigrateCommon *args) } /* Wait for the first serial output from the source */ - wait_for_serial("src_serial"); + if (args->result == MIG_TEST_SUCCEED) { + wait_for_serial("src_serial"); + } if (!args->connect_uri) { g_autofree char *local_connect_uri = -- cgit v1.1 From 00269477c2184393d23865a089a3d71b03ef3d17 Mon Sep 17 00:00:00 2001 From: Thomas Huth Date: Mon, 22 Aug 2022 17:56:07 +0100 Subject: tests/qtest/migration-test: Remove duplicated test_postcopy from the test plan MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit test_postcopy() is currently run twice - which is just a waste of resources and time. The commit d1a27b169b2d that introduced the duplicate talked about renaming the "postcopy/unix" test, but apparently it forgot to remove the old entry. Let's do that now. Fixes: d1a27b169b ("tests: Add postcopy tls migration test") Signed-off-by: Thomas Huth Reviewed-by: Daniel P. Berrangé Message-Id: <20220819053802.296584-5-thuth@redhat.com> Signed-off-by: Alex Bennée Reviewed-by: Juan Quintela Message-Id: <20220822165608.2980552-6-alex.bennee@linaro.org> --- tests/qtest/migration-test.c | 1 - 1 file changed, 1 deletion(-) (limited to 'tests/qtest/migration-test.c') diff --git a/tests/qtest/migration-test.c b/tests/qtest/migration-test.c index 7be321b..f63edd0 100644 --- a/tests/qtest/migration-test.c +++ b/tests/qtest/migration-test.c @@ -2461,7 +2461,6 @@ int main(int argc, char **argv) module_call_init(MODULE_INIT_QOM); if (has_uffd) { - qtest_add_func("/migration/postcopy/unix", test_postcopy); qtest_add_func("/migration/postcopy/plain", test_postcopy); qtest_add_func("/migration/postcopy/recovery/plain", test_postcopy_recovery); -- cgit v1.1