| Message ID | 20231009184326.15777-7-farosas@suse.de |
|---|---|
| State | New |
| Headers | show |
| Series | scripts/migration: Fix analyze-migration.py and add a test | expand |
On 09/10/2023 20.43, Fabiano Rosas wrote: > Add a smoke test that migrates to a file and gives it to the > script. It should catch the most annoying errors such as changes in > the ram flags. > > After code has been merged it becomes way harder to figure out what is > causing the script to fail, the person making the change is the most > likely to know right away what the problem is. > > Signed-off-by: Fabiano Rosas <farosas@suse.de> > --- > tests/qtest/meson.build | 2 ++ > tests/qtest/migration-test.c | 60 ++++++++++++++++++++++++++++++++++++ > 2 files changed, 62 insertions(+) Acked-by: Thomas Huth <thuth@redhat.com>
Fabiano Rosas <farosas@suse.de> wrote: > Add a smoke test that migrates to a file and gives it to the > script. It should catch the most annoying errors such as changes in > the ram flags. > > After code has been merged it becomes way harder to figure out what is > causing the script to fail, the person making the change is the most > likely to know right away what the problem is. > > Signed-off-by: Fabiano Rosas <farosas@suse.de> Reviewed-by: Juan Quintela <quintela@redhat.com> > --- > tests/qtest/meson.build | 2 ++ > tests/qtest/migration-test.c | 60 ++++++++++++++++++++++++++++++++++++ > 2 files changed, 62 insertions(+) > > diff --git a/tests/qtest/meson.build b/tests/qtest/meson.build > index 1fba07f4ed..5e82eccb62 100644 > --- a/tests/qtest/meson.build > +++ b/tests/qtest/meson.build > @@ -356,6 +356,8 @@ foreach dir : target_dirs > test_deps += [qsd] > endif > > + qtest_env.set('PYTHON', python.full_path()) > + I accept it, but I think that this part of the test should be in a different patch so meson people could comment O:-) > + > + pid = fork(); live and see, g_test and qemu don't have a function to execute a script? Wow.
Juan Quintela <quintela@redhat.com> writes: > Fabiano Rosas <farosas@suse.de> wrote: >> Add a smoke test that migrates to a file and gives it to the >> script. It should catch the most annoying errors such as changes in >> the ram flags. >> >> After code has been merged it becomes way harder to figure out what is >> causing the script to fail, the person making the change is the most >> likely to know right away what the problem is. >> >> Signed-off-by: Fabiano Rosas <farosas@suse.de> > > Reviewed-by: Juan Quintela <quintela@redhat.com> > > >> --- >> tests/qtest/meson.build | 2 ++ >> tests/qtest/migration-test.c | 60 ++++++++++++++++++++++++++++++++++++ >> 2 files changed, 62 insertions(+) >> >> diff --git a/tests/qtest/meson.build b/tests/qtest/meson.build >> index 1fba07f4ed..5e82eccb62 100644 >> --- a/tests/qtest/meson.build >> +++ b/tests/qtest/meson.build >> @@ -356,6 +356,8 @@ foreach dir : target_dirs >> test_deps += [qsd] >> endif >> >> + qtest_env.set('PYTHON', python.full_path()) >> + > > I accept it, but I think that this part of the test should be in a > different patch so meson people could comment O:-) > >> + >> + pid = fork(); > > live and see, g_test and qemu don't have a function to execute a script? gtest has one to execute a _function_ in a fork, but fork+exec no.
diff --git a/tests/qtest/meson.build b/tests/qtest/meson.build index 1fba07f4ed..5e82eccb62 100644 --- a/tests/qtest/meson.build +++ b/tests/qtest/meson.build @@ -356,6 +356,8 @@ foreach dir : target_dirs test_deps += [qsd] endif + qtest_env.set('PYTHON', python.full_path()) + foreach test : target_qtests # Executables are shared across targets, declare them only the first time we # encounter them diff --git a/tests/qtest/migration-test.c b/tests/qtest/migration-test.c index 46f1c275a2..cb1b6e890c 100644 --- a/tests/qtest/migration-test.c +++ b/tests/qtest/migration-test.c @@ -66,6 +66,8 @@ static bool got_dst_resume; */ #define DIRTYLIMIT_TOLERANCE_RANGE 25 /* MB/s */ +#define ANALYZE_SCRIPT "scripts/analyze-migration.py" + #if defined(__linux__) #include <sys/syscall.h> #include <sys/vfs.h> @@ -1510,6 +1512,61 @@ static void test_baddest(void) test_migrate_end(from, to, false); } +#ifndef _WIN32 +static void test_analyze_script(void) +{ + MigrateStart args = { + .opts_source = "-uuid 11111111-1111-1111-1111-111111111111", + }; + QTestState *from, *to; + g_autofree char *uri = NULL; + g_autofree char *file = NULL; + int pid, wstatus; + const char *python = g_getenv("PYTHON"); + + if (!python) { + g_test_skip("PYTHON variable not set"); + return; + } + + /* dummy url */ + if (test_migrate_start(&from, &to, "tcp:127.0.0.1:0", &args)) { + return; + } + + /* + * Setting these two capabilities causes the "configuration" + * vmstate to include subsections for them. The script needs to + * parse those subsections properly. + */ + migrate_set_capability(from, "validate-uuid", true); + migrate_set_capability(from, "x-ignore-shared", true); + + file = g_strdup_printf("%s/migfile", tmpfs); + uri = g_strdup_printf("exec:cat > %s", file); + + migrate_ensure_converge(from); + migrate_qmp(from, uri, "{}"); + wait_for_migration_complete(from); + + pid = fork(); + if (!pid) { + close(1); + open("/dev/null", O_WRONLY); + execl(python, python, ANALYZE_SCRIPT, "-f", file, NULL); + g_assert_not_reached(); + } + + g_assert(waitpid(pid, &wstatus, 0) == pid); + if (WIFEXITED(wstatus) && WEXITSTATUS(wstatus) != 0) { + g_test_message("Failed to analyze the migration stream"); + g_test_fail(); + } + test_migrate_end(from, to, false); + cleanup("migfile"); +} +#endif + static void test_precopy_common(MigrateCommon *args) { QTestState *from, *to; @@ -2844,6 +2901,9 @@ int main(int argc, char **argv) } qtest_add_func("/migration/bad_dest", test_baddest); +#ifndef _WIN32 + qtest_add_func("/migration/analyze-script", test_analyze_script); +#endif qtest_add_func("/migration/precopy/unix/plain", test_precopy_unix_plain); qtest_add_func("/migration/precopy/unix/xbzrle", test_precopy_unix_xbzrle); /*
Add a smoke test that migrates to a file and gives it to the script. It should catch the most annoying errors such as changes in the ram flags. After code has been merged it becomes way harder to figure out what is causing the script to fail, the person making the change is the most likely to know right away what the problem is. Signed-off-by: Fabiano Rosas <farosas@suse.de> --- tests/qtest/meson.build | 2 ++ tests/qtest/migration-test.c | 60 ++++++++++++++++++++++++++++++++++++ 2 files changed, 62 insertions(+)