tests/qtest/migration-test: Only wait for serial output where migration succeeds
PATCH 1/1 tests/qtest/migration-test: Only wait for serial output where migration succeeds
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!
--- tests/qtest/migration-test.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
tests/qtest/migration-test.c +3 -1
@@ -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 =
Signature · 1 line
2.31.1
Quoted 18 lines · * Thomas Huth ([email protected]) wrote:
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!
Signed-off-by Thomas Huth <[email protected]>--- tests/qtest/migration-test.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)tests/qtest/migration-test.c +0
-0
tests/qtest/migration-test.c static void test_precopy_common(MigrateCommon *args) · line 1312
Quoted 7 lines
tests/qtest/migration-test.c +3
-1@@ -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" ); + }
I think this is OK, albeit only because all of the current fail-tests are ones where the connection fails; we're not relying on the behaviour of the emulator at all. I wonder if it's worth going further and running the source qemu's with -S (which may or not fail in other ways).
Quoted 6 lines
tests/qtest/migration-test.c +0
-0if (!args->connect_uri) { g_autofree char *local_connect_uri =Signature · 1 line
2.31.1
Signature · 1 line
Dr. David Alan Gilbert / [email protected] / Manchester, UK
Quoted 21 lines · Dr. David Alan Gilbert
Quoted 20 lines · * Thomas Huth ([email protected]) wrote:
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!
Signed-off-by Thomas Huth <[email protected]>--- tests/qtest/migration-test.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)tests/qtest/migration-test.c +0
-0@@ -1307,7 +1307,9 @@ static void test_precopy_common(MigrateCommon *args) }
Quoted 10 lines
tests/qtest/migration-test.c static void test_precopy_common(MigrateCommon *args) · line 1312
Quoted 5 lines
tests/qtest/migration-test.c +3
-1/* 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" ); + }I think this is OK, albeit only because all of the current fail-tests are ones where the connection fails; we're not relying on the behaviour of the emulator at all. I wonder if it's worth going further and running the source qemu's with -S (which may or not fail in other ways).
Yeah, if we need to cope with yet another failure scenario later we can add more to the MIG_TEST enum. For now, also adding -S seems like a reasonable idea to me.
Quoted 12 lines
Reviewed-by Dr. David Alan Gilbert <[email protected]>Quoted 6 lines
tests/qtest/migration-test.c +0
-0if (!args->connect_uri) { g_autofree char *local_connect_uri =Signature · 1 line
2.31.1Signature · 1 line
Dr. David Alan Gilbert / [email protected] / Manchester, UK
With regards,
Daniel
Signature · 3 lines
|: https://berrange.com -o- https://www.flickr.com/photos/dberrange :| |: https://libvirt.org -o- https://fstop138.berrange.com :| |: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|
Quoted 18 lines · Thomas Huth
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!
Signed-off-by Thomas Huth <[email protected]>--- tests/qtest/migration-test.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)tests/qtest/migration-test.c +0
-0
tests/qtest/migration-test.c static void test_precopy_common(MigrateCommon *args) · line 1315
Quoted 10 lines
tests/qtest/migration-test.c +3
-1@@ -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 =
With regards,
Daniel
Signature · 3 lines
|: https://berrange.com -o- https://www.flickr.com/photos/dberrange :| |: https://libvirt.org -o- https://fstop138.berrange.com :| |: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|