| Message ID | 20190923131022.15498-2-dgilbert@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | migration test tweeks | expand |
On Mon, Sep 23, 2019 at 02:10:21PM +0100, Dr. David Alan Gilbert (git) wrote: > From: "Dr. David Alan Gilbert" <dgilbert@redhat.com> > > We've got various places where we wait for a migration to enter > a given state; but if we enter an unexpected state we tend to fail > in odd ways; add a mechanism for explicitly testing for any state > which we shouldn't be in. > > Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com> > --- > tests/migration-test.c | 23 +++++++++++++++++------ > 1 file changed, 17 insertions(+), 6 deletions(-) > > diff --git a/tests/migration-test.c b/tests/migration-test.c > index 258aa064d4..9c62ee5331 100644 > --- a/tests/migration-test.c > +++ b/tests/migration-test.c > @@ -255,15 +255,19 @@ static void read_blocktime(QTestState *who) > } > > static void wait_for_migration_status(QTestState *who, > - const char *goal) > + const char *goal, > + const char **ungoals) > { > while (true) { > bool completed; > char *status; > + const char **ungoal; > > status = migrate_query_status(who); > completed = strcmp(status, goal) == 0; > - g_assert_cmpstr(status, !=, "failed"); > + for (ungoal = ungoals; *ungoal; ungoal++) { > + g_assert_cmpstr(status, !=, *ungoal); > + } > g_free(status); > if (completed) { > return; > @@ -274,7 +278,8 @@ static void wait_for_migration_status(QTestState *who, > > static void wait_for_migration_complete(QTestState *who) > { > - wait_for_migration_status(who, "completed"); > + wait_for_migration_status(who, "completed", > + (const char * []) { "failed", NULL }); > } > > static void wait_for_migration_pass(QTestState *who) > @@ -809,7 +814,9 @@ static void test_postcopy_recovery(void) > * Wait until postcopy is really started; we can only run the > * migrate-pause command during a postcopy > */ > - wait_for_migration_status(from, "postcopy-active"); > + wait_for_migration_status(from, "postcopy-active", > + (const char * []) { "failed", > + "completed", NULL }); > > /* > * Manually stop the postcopy migration. This emulates a network > @@ -822,7 +829,9 @@ static void test_postcopy_recovery(void) > * migrate-recover command can only succeed if destination machine > * is in the paused state > */ > - wait_for_migration_status(to, "postcopy-paused"); > + wait_for_migration_status(to, "postcopy-paused", > + (const char * []) { "failed", "active", > + "completed", NULL }); > > /* > * Create a new socket to emulate a new channel that is different > @@ -836,7 +845,9 @@ static void test_postcopy_recovery(void) > * Try to rebuild the migration channel using the resume flag and > * the newly created channel > */ > - wait_for_migration_status(from, "postcopy-paused"); > + wait_for_migration_status(from, "postcopy-paused", > + (const char * []) { "failed", "active", > + "completed", NULL }); > migrate(from, uri, "{'resume': true}"); > g_free(uri); > > -- > 2.21.0 > > LGTM (tested with x86_64 and aarch64 targets on an x86_64 host). Reviewed-by: Cleber Rosa <crosa@redhat.com> Tested-by: Cleber Rosa <crosa@redhat.com>
Dr. David Alan Gilbert (git) <dgilbert@redhat.com> writes: > From: "Dr. David Alan Gilbert" <dgilbert@redhat.com> > > We've got various places where we wait for a migration to enter > a given state; but if we enter an unexpected state we tend to fail > in odd ways; add a mechanism for explicitly testing for any state > which we shouldn't be in. > > Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com> > --- > tests/migration-test.c | 23 +++++++++++++++++------ > 1 file changed, 17 insertions(+), 6 deletions(-) > > diff --git a/tests/migration-test.c b/tests/migration-test.c > index 258aa064d4..9c62ee5331 100644 > --- a/tests/migration-test.c > +++ b/tests/migration-test.c > @@ -255,15 +255,19 @@ static void read_blocktime(QTestState *who) > } > > static void wait_for_migration_status(QTestState *who, > - const char *goal) > + const char *goal, > + const char **ungoals) > { > while (true) { > bool completed; > char *status; > + const char **ungoal; > > status = migrate_query_status(who); > completed = strcmp(status, goal) == 0; > - g_assert_cmpstr(status, !=, "failed"); > + for (ungoal = ungoals; *ungoal; ungoal++) { > + g_assert_cmpstr(status, !=, *ungoal); > + } You could use: g_assert(!g_strv_contains(ungoals, status)) if you wanted to be more gliby. But anyway: Reviewed-by: Alex Bennée <alex.bennee@linaro.org> > g_free(status); > if (completed) { > return; > @@ -274,7 +278,8 @@ static void wait_for_migration_status(QTestState *who, > > static void wait_for_migration_complete(QTestState *who) > { > - wait_for_migration_status(who, "completed"); > + wait_for_migration_status(who, "completed", > + (const char * []) { "failed", NULL }); > } > > static void wait_for_migration_pass(QTestState *who) > @@ -809,7 +814,9 @@ static void test_postcopy_recovery(void) > * Wait until postcopy is really started; we can only run the > * migrate-pause command during a postcopy > */ > - wait_for_migration_status(from, "postcopy-active"); > + wait_for_migration_status(from, "postcopy-active", > + (const char * []) { "failed", > + "completed", NULL }); > > /* > * Manually stop the postcopy migration. This emulates a network > @@ -822,7 +829,9 @@ static void test_postcopy_recovery(void) > * migrate-recover command can only succeed if destination machine > * is in the paused state > */ > - wait_for_migration_status(to, "postcopy-paused"); > + wait_for_migration_status(to, "postcopy-paused", > + (const char * []) { "failed", "active", > + "completed", NULL }); > > /* > * Create a new socket to emulate a new channel that is different > @@ -836,7 +845,9 @@ static void test_postcopy_recovery(void) > * Try to rebuild the migration channel using the resume flag and > * the newly created channel > */ > - wait_for_migration_status(from, "postcopy-paused"); > + wait_for_migration_status(from, "postcopy-paused", > + (const char * []) { "failed", "active", > + "completed", NULL }); > migrate(from, uri, "{'resume': true}"); > g_free(uri); -- Alex Bennée
"Dr. David Alan Gilbert (git)" <dgilbert@redhat.com> wrote: > From: "Dr. David Alan Gilbert" <dgilbert@redhat.com> > > We've got various places where we wait for a migration to enter > a given state; but if we enter an unexpected state we tend to fail > in odd ways; add a mechanism for explicitly testing for any state > which we shouldn't be in. > > Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com> Reviewed-by: Juan Quintela <quintela@redhat.com> > - wait_for_migration_status(from, "postcopy-active"); > + wait_for_migration_status(from, "postcopy-active", > + (const char * []) { "failed", > + "completed", NULL }); > I really preffer not to use that kind of casts. const char *ungoals[] = { "failed", "completed", NULL }; but as it is you who are doing the patches, I will not complain O:-)
diff --git a/tests/migration-test.c b/tests/migration-test.c index 258aa064d4..9c62ee5331 100644 --- a/tests/migration-test.c +++ b/tests/migration-test.c @@ -255,15 +255,19 @@ static void read_blocktime(QTestState *who) } static void wait_for_migration_status(QTestState *who, - const char *goal) + const char *goal, + const char **ungoals) { while (true) { bool completed; char *status; + const char **ungoal; status = migrate_query_status(who); completed = strcmp(status, goal) == 0; - g_assert_cmpstr(status, !=, "failed"); + for (ungoal = ungoals; *ungoal; ungoal++) { + g_assert_cmpstr(status, !=, *ungoal); + } g_free(status); if (completed) { return; @@ -274,7 +278,8 @@ static void wait_for_migration_status(QTestState *who, static void wait_for_migration_complete(QTestState *who) { - wait_for_migration_status(who, "completed"); + wait_for_migration_status(who, "completed", + (const char * []) { "failed", NULL }); } static void wait_for_migration_pass(QTestState *who) @@ -809,7 +814,9 @@ static void test_postcopy_recovery(void) * Wait until postcopy is really started; we can only run the * migrate-pause command during a postcopy */ - wait_for_migration_status(from, "postcopy-active"); + wait_for_migration_status(from, "postcopy-active", + (const char * []) { "failed", + "completed", NULL }); /* * Manually stop the postcopy migration. This emulates a network @@ -822,7 +829,9 @@ static void test_postcopy_recovery(void) * migrate-recover command can only succeed if destination machine * is in the paused state */ - wait_for_migration_status(to, "postcopy-paused"); + wait_for_migration_status(to, "postcopy-paused", + (const char * []) { "failed", "active", + "completed", NULL }); /* * Create a new socket to emulate a new channel that is different @@ -836,7 +845,9 @@ static void test_postcopy_recovery(void) * Try to rebuild the migration channel using the resume flag and * the newly created channel */ - wait_for_migration_status(from, "postcopy-paused"); + wait_for_migration_status(from, "postcopy-paused", + (const char * []) { "failed", "active", + "completed", NULL }); migrate(from, uri, "{'resume': true}"); g_free(uri);