[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH 3/6] tests: Add precopy test using deprecated co
From: |
Dr. David Alan Gilbert |
Subject: |
Re: [Qemu-devel] [PATCH 3/6] tests: Add precopy test using deprecated commands |
Date: |
Mon, 16 Oct 2017 16:40:01 +0100 |
User-agent: |
Mutt/1.9.1 (2017-09-22) |
* Juan Quintela (address@hidden) wrote:
> Signed-off-by: Juan Quintela <address@hidden>
> ---
> tests/migration-test.c | 71
> ++++++++++++++++++++++++++++++++++++++++++++++++++
> 1 file changed, 71 insertions(+)
>
> diff --git a/tests/migration-test.c b/tests/migration-test.c
> index 8ef2b72459..8549e4c2c6 100644
> --- a/tests/migration-test.c
> +++ b/tests/migration-test.c
> @@ -422,6 +422,76 @@ static void migrate_set_parameter(QTestState *who, const
> char *parameter,
> QDECREF(rsp);
> }
>
> +static void migrate_set_downtime(QTestState *who, const char *value)
> +{
> + QDict *rsp;
> + gchar *cmd;
> +
> + cmd = g_strdup_printf("{ 'execute': 'migrate_set_downtime',"
> + "'arguments': { 'value': %s } }", value);
> + rsp = qtest_qmp(who, cmd);
> + g_free(cmd);
> + g_assert(qdict_haskey(rsp, "return"));
> + QDECREF(rsp);
> +}
> +
> +static void migrate_set_speed(QTestState *who, const char *value)
> +{
> + QDict *rsp;
> + gchar *cmd;
> +
> + cmd = g_strdup_printf("{ 'execute': 'migrate_set_speed',"
> + "'arguments': { 'value': %s } }", value);
> + rsp = qtest_qmp(who, cmd);
> + g_free(cmd);
> + g_assert(qdict_haskey(rsp, "return"));
> + QDECREF(rsp);
> +}
> +
> +static void test_precopy_deprecated(const char *uri)
> +{
> + QTestState *from, *to;
> +
> + test_migrate_start(&from, &to, uri);
> +
> + /* We want to pick a speed slow enough that the test completes
> + * quickly, but that it doesn't complete precopy even on a slow
> + * machine, so also set the downtime.
> + */
> + /* 100 ms */
> + migrate_set_downtime(from, "100");
> + /* 1MB/s slow*/
> + migrate_set_speed(from, "100000000");
Can't we share more/most of this function?
For example, how about we have a migrate_set_speed(who,value, old)
tht is :
if (old) {
migrate_set_speed...
} else {
migrate_set_parameter
}
then test_precopy(const char *uri, bool old)
and we've duped most of it?
Dave
> + /* Wait for the first serial output from the source */
> + wait_for_serial("src_serial");
> +
> + migrate(from, uri);
> +
> + wait_for_migration_pass(from);
> +
> + /* 1GB/s now it should converge */
> + migrate_set_speed(from, "1000000000");
> +
> + if (!got_stop) {
> + qtest_qmp_eventwait(from, "STOP");
> + }
> + qtest_qmp_eventwait(to, "RESUME");
> +
> + wait_for_serial("dest_serial");
> + wait_for_migration_complete(from);
> +
> + test_migrate_end(from, to);
> +}
> +
> +static void test_deprecated_unix(void)
> +{
> + char *uri = g_strdup_printf("unix:%s/migsocket", tmpfs);
> +
> + test_precopy_deprecated(uri);
> + g_free(uri);
> +}
> +
> static void test_precopy(const char *uri)
> {
> QTestState *from, *to;
> @@ -490,6 +560,7 @@ int main(int argc, char **argv)
>
> qtest_add_func("/migration/precopy/unix", test_precopy_unix);
> qtest_add_func("/migration/precopy/tcp", test_precopy_tcp);
> + qtest_add_func("/migration/deprecated/unix", test_deprecated_unix);
>
> ret = g_test_run();
>
> --
> 2.13.5
>
--
Dr. David Alan Gilbert / address@hidden / Manchester, UK
- [Qemu-devel] [PATCH 0/6] Add make check tests for Migration, Juan Quintela, 2017/10/04
- [Qemu-devel] [PATCH 2/6] tests: Add basic migration precopy tcp test, Juan Quintela, 2017/10/04
- [Qemu-devel] [PATCH 3/6] tests: Add precopy test using deprecated commands, Juan Quintela, 2017/10/04
- Re: [Qemu-devel] [PATCH 3/6] tests: Add precopy test using deprecated commands,
Dr. David Alan Gilbert <=
- [Qemu-devel] [PATCH 1/6] tests: Add basic migration precopy test, Juan Quintela, 2017/10/04
- Re: [Qemu-devel] [PATCH 1/6] tests: Add basic migration precopy test, Eric Blake, 2017/10/04
- Re: [Qemu-devel] [PATCH 1/6] tests: Add basic migration precopy test, Peter Xu, 2017/10/09
- Re: [Qemu-devel] [PATCH 1/6] tests: Add basic migration precopy test, Dr. David Alan Gilbert, 2017/10/16
- Re: [Qemu-devel] [PATCH 1/6] tests: Add basic migration precopy test, Peter Xu, 2017/10/18