On Fri, Jul 06, 2018 at 10:19:51AM +0800, Peter Xu wrote: > On Thu, Jul 05, 2018 at 03:01:44PM +0530, Balamuruhan S wrote: > > On Thu, Jul 05, 2018 at 11:17:50AM +0800, Peter Xu wrote: > > > Separate the old postcopy UNIX socket test into three steps, provide a > > > helper for each step. With these helpers, we can do more compliated > > > tests like postcopy recovery, while keep the codes shared. > > > > > > Signed-off-by: Peter Xu <pet...@redhat.com> > > > --- > > > tests/migration-test.c | 38 +++++++++++++++++++++++++++----------- > > > 1 file changed, 27 insertions(+), 11 deletions(-) > > > > > > diff --git a/tests/migration-test.c b/tests/migration-test.c > > > index 3a85446f95..2155869b96 100644 > > > --- a/tests/migration-test.c > > > +++ b/tests/migration-test.c > > > @@ -351,13 +351,19 @@ static void migrate(QTestState *who, const char > > > *uri) > > > qobject_unref(rsp); > > > } > > > > > > -static void migrate_start_postcopy(QTestState *who) > > > +static void migrate_postcopy_start(QTestState *from, QTestState *to) > > > { > > > QDict *rsp; > > > > > > - rsp = wait_command(who, "{ 'execute': 'migrate-start-postcopy' }"); > > > + rsp = wait_command(from, "{ 'execute': 'migrate-start-postcopy' }"); > > > g_assert(qdict_haskey(rsp, "return")); > > > qobject_unref(rsp); > > > + > > > + if (!got_stop) { > > > + qtest_qmp_eventwait(from, "STOP"); > > > + } > > > + > > > + qtest_qmp_eventwait(to, "RESUME"); > > > } > > > > > > static void test_migrate_start(QTestState **from, QTestState **to, > > > @@ -505,7 +511,8 @@ static void test_deprecated(void) > > > qtest_quit(from); > > > } > > > > > > -static void test_postcopy(void) > > > +static void migrate_postcopy_prepare(QTestState **from_ptr, > > > + QTestState **to_ptr) > > > > if we have uri as one of the configurable argument, it would be still > > better, so that in future we can call migrate_postcopy_prepare() with > > any different uri. > > Yes, though we'd better have a first user of it. Now postcopy only > covers unix socket test. We don't have a large matrix yet. > > We can add that when we start to add more complicated tests for > postcopy. Thanks,
sure Peter. Reviewed-by: Balamuruhan S <bal...@linux.vnet.ibm.com> > > -- > Peter Xu >