[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH v3 2/6] tests: migration test deprecated command
From: |
Juan Quintela |
Subject: |
Re: [Qemu-devel] [PATCH v3 2/6] tests: migration test deprecated commands |
Date: |
Tue, 26 Dec 2017 20:53:25 +0100 |
User-agent: |
Gnus/5.13 (Gnus v5.13) Emacs/25.3 (gnu/linux) |
"Dr. David Alan Gilbert" <address@hidden> wrote:
> * Juan Quintela (address@hidden) wrote:
>> We now test the deprecated commands everytime that we test the new
>> commands. This makes unnecesary to add tests for deprecated commands.
>>
>> Signed-off-by: Juan Quintela <address@hidden>
>> ---
>> tests/migration-test.c | 32 ++++++++++++++++++++++++++++----
>> 1 file changed, 28 insertions(+), 4 deletions(-)
>>
>> diff --git a/tests/migration-test.c b/tests/migration-test.c
>> index 799e24ebc6..51f49c74e9 100644
>> --- a/tests/migration-test.c
>> +++ b/tests/migration-test.c
>> @@ -369,7 +369,7 @@ static void migrate_check_parameter(QTestState *who,
>> const char *parameter,
>> QDECREF(rsp);
>> }
>>
>> -static void migrate_set_downtime(QTestState *who, const double value)
>> +static void deprecated_set_downtime(QTestState *who, const double value)
>> {
>> QDict *rsp;
>> gchar *cmd;
>> @@ -388,7 +388,7 @@ static void migrate_set_downtime(QTestState *who, const
>> double value)
>> g_free(expected);
>> }
>>
>> -static void migrate_set_speed(QTestState *who, const char *value)
>> +static void deprecated_set_speed(QTestState *who, const char *value)
>> {
>> QDict *rsp;
>> gchar *cmd;
>> @@ -402,6 +402,30 @@ static void migrate_set_speed(QTestState *who, const
>> char *value)
>> migrate_check_parameter(who, "max-bandwidth", value);
>> }
>>
>> +static void migrate_set_parameter(QTestState *who, const char *parameter,
>> + const char *value)
>> +{
>> + QDict *rsp;
>> + gchar *cmd;
>> +
>> + if (strcmp(parameter, "downtime-limit") == 0) {
>> + deprecated_set_downtime(who, 0.12345);
>> + }
>> +
>> + if (strcmp(parameter, "max-bandwidth") == 0) {
>> + deprecated_set_speed(who, "12345");
>> + }
>
> I find that odd; you call migrate_set_parameter to set a particular
> value, but we set them to a different arbitrary value first?
If I do:
migrate_deprecated_command(real_value)
migrate_non_deprecated_command(real_value)
here the value is already set, so I am not sure that it is working.
This other way, if there is a _deprecated_ command, I set it to a
known value, check that it was set correctly, and then set the real
value.
Later, Juan.
>
> Dave
>
>> + cmd = g_strdup_printf("{ 'execute': 'migrate-set-parameters',"
>> + "'arguments': { '%s': %s } }",
>> + parameter, value);
>> + rsp = qtest_qmp(who, cmd);
>> + g_free(cmd);
>> + g_assert(qdict_haskey(rsp, "return"));
>> + QDECREF(rsp);
>> + migrate_check_parameter(who, parameter, value);
>> +}
>> +
>> static void migrate_set_capability(QTestState *who, const char *capability,
>> const char *value)
>> {
>> @@ -530,8 +554,8 @@ static void test_migrate(void)
>> * quickly, but that it doesn't complete precopy even on a slow
>> * machine, so also set the downtime.
>> */
>> - migrate_set_speed(from, "100000000");
>> - migrate_set_downtime(from, 0.001);
>> + migrate_set_parameter(from, "max-bandwidth", "100000000");
>> + migrate_set_parameter(from, "downtime-limit", "1");
>>
>> /* Wait for the first serial output from the source */
>> wait_for_serial("src_serial");
>> --
>> 2.14.3
>>
> --
> Dr. David Alan Gilbert / address@hidden / Manchester, UK
- [Qemu-devel] [PATCH v3 0/6] Add make check tests for Migration, Juan Quintela, 2017/12/01
- [Qemu-devel] [PATCH v3 4/6] tests: Add basic migration precopy tcp test, Juan Quintela, 2017/12/01
- [Qemu-devel] [PATCH v3 2/6] tests: migration test deprecated commands, Juan Quintela, 2017/12/01
- [Qemu-devel] [PATCH v3 3/6] tests: Add migration precopy test, Juan Quintela, 2017/12/01
- [Qemu-devel] [PATCH v3 6/6] [RFH] tests: Add migration compress threads tests, Juan Quintela, 2017/12/01
- [Qemu-devel] [PATCH v3 1/6] migration: free result string, Juan Quintela, 2017/12/01
- [Qemu-devel] [PATCH v3 5/6] tests: Add migration xbzrle test, Juan Quintela, 2017/12/01