tests/qtest: misc tweaks to readconfig

[PATCH] tests/qtest: misc tweaks to readconfig

Posted by Daniel P. Berrangé 3 years, 6 months ago

The property name parameter is ignored when visiting a top
level type, but the obvious typo should be fixed to avoid
confusion. A few indentation issues were tidied up. We
can break out of the loop when finding the RNG device.
Finally, close the temp FD immediately when no longer
needed.

Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
---
 tests/qtest/readconfig-test.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/tests/qtest/readconfig-test.c b/tests/qtest/readconfig-test.c
index 2e604d7c2d..c7a9b0c7dd 100644
--- a/tests/qtest/readconfig-test.c
+++ b/tests/qtest/readconfig-test.c
@@ -33,13 +33,12 @@ static QTestState *qtest_init_with_config(const char *cfgdata)
     g_assert_cmpint(cfgfd, >=, 0);
 
     ret = qemu_write_full(cfgfd, cfgdata, strlen(cfgdata));
+    close(cfgfd);
     if (ret < 0) {
         unlink(cfgpath);
     }
     g_assert_cmpint(ret, ==, strlen(cfgdata));
 
-    close(cfgfd);
-
     args = g_strdup_printf("-nodefaults -machine none -readconfig %s", cfgpath);
 
     qts = qtest_init(args);
@@ -79,7 +78,7 @@ static void test_x86_memdev(void)
         "size = \"200\"";
 
     qts = qtest_init_with_config(cfgdata);
-   /* Test valid command */
+    /* Test valid command */
     resp = qtest_qmp(qts, "{ 'execute': 'query-memdev' }");
     test_x86_memdev_resp(qdict_get(resp, "return"));
     qobject_unref(resp);
@@ -96,7 +95,7 @@ static void test_spice_resp(QObject *res)
 
     g_assert(res);
     v = qobject_input_visitor_new(res);
-    visit_type_SpiceInfo(v, "spcie", &spice, &error_abort);
+    visit_type_SpiceInfo(v, "spice", &spice, &error_abort);
 
     g_assert(spice);
     g_assert(spice->enabled);
@@ -114,7 +113,7 @@ static void test_spice(void)
         "unix = \"on\"\n";
 
     qts = qtest_init_with_config(cfgdata);
-   /* Test valid command */
+    /* Test valid command */
     resp = qtest_qmp(qts, "{ 'execute': 'query-spice' }");
     test_spice_resp(qdict_get(resp, "return"));
     qobject_unref(resp);
@@ -144,6 +143,7 @@ static void test_object_rng_resp(QObject *res)
         if (g_str_equal(obj->name, "rng0") &&
             g_str_equal(obj->type, "child<rng-builtin>")) {
             seen_rng = true;
+            break;
         }
 
         tmp = tmp->next;
@@ -164,7 +164,7 @@ static void test_object_rng(void)
         "id = \"rng0\"\n";
 
     qts = qtest_init_with_config(cfgdata);
-   /* Test valid command */
+    /* Test valid command */
     resp = qtest_qmp(qts,
                      "{ 'execute': 'qom-list',"
                      "  'arguments': {'path': '/objects' }}");
-- 
2.37.1

Re: [PATCH] tests/qtest: misc tweaks to readconfig

Posted by Philippe Mathieu-Daudé via 3 years, 5 months ago

On 9/8/22 11:38, Daniel P. Berrangé wrote:
> The property name parameter is ignored when visiting a top
> level type, but the obvious typo should be fixed to avoid
> confusion. A few indentation issues were tidied up. We
> can break out of the loop when finding the RNG device.
> Finally, close the temp FD immediately when no longer
> needed.
> 
> Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
> ---
>   tests/qtest/readconfig-test.c | 12 ++++++------
>   1 file changed, 6 insertions(+), 6 deletions(-)

Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>

Re: [PATCH] tests/qtest: misc tweaks to readconfig

Posted by Thomas Huth 3 years, 5 months ago

On 09/08/2022 11.38, Daniel P. Berrangé wrote:
> The property name parameter is ignored when visiting a top
> level type, but the obvious typo should be fixed to avoid
> confusion. A few indentation issues were tidied up. We
> can break out of the loop when finding the RNG device.
> Finally, close the temp FD immediately when no longer
> needed.
> 
> Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
> ---
>   tests/qtest/readconfig-test.c | 12 ++++++------
>   1 file changed, 6 insertions(+), 6 deletions(-)
> 
> diff --git a/tests/qtest/readconfig-test.c b/tests/qtest/readconfig-test.c
> index 2e604d7c2d..c7a9b0c7dd 100644
> --- a/tests/qtest/readconfig-test.c
> +++ b/tests/qtest/readconfig-test.c
> @@ -33,13 +33,12 @@ static QTestState *qtest_init_with_config(const char *cfgdata)
>       g_assert_cmpint(cfgfd, >=, 0);
>   
>       ret = qemu_write_full(cfgfd, cfgdata, strlen(cfgdata));
> +    close(cfgfd);
>       if (ret < 0) {
>           unlink(cfgpath);
>       }
>       g_assert_cmpint(ret, ==, strlen(cfgdata));
>   
> -    close(cfgfd);
> -
>       args = g_strdup_printf("-nodefaults -machine none -readconfig %s", cfgpath);
>   
>       qts = qtest_init(args);
> @@ -79,7 +78,7 @@ static void test_x86_memdev(void)
>           "size = \"200\"";
>   
>       qts = qtest_init_with_config(cfgdata);
> -   /* Test valid command */
> +    /* Test valid command */
>       resp = qtest_qmp(qts, "{ 'execute': 'query-memdev' }");
>       test_x86_memdev_resp(qdict_get(resp, "return"));
>       qobject_unref(resp);
> @@ -96,7 +95,7 @@ static void test_spice_resp(QObject *res)
>   
>       g_assert(res);
>       v = qobject_input_visitor_new(res);
> -    visit_type_SpiceInfo(v, "spcie", &spice, &error_abort);
> +    visit_type_SpiceInfo(v, "spice", &spice, &error_abort);
>   
>       g_assert(spice);
>       g_assert(spice->enabled);
> @@ -114,7 +113,7 @@ static void test_spice(void)
>           "unix = \"on\"\n";
>   
>       qts = qtest_init_with_config(cfgdata);
> -   /* Test valid command */
> +    /* Test valid command */
>       resp = qtest_qmp(qts, "{ 'execute': 'query-spice' }");
>       test_spice_resp(qdict_get(resp, "return"));
>       qobject_unref(resp);
> @@ -144,6 +143,7 @@ static void test_object_rng_resp(QObject *res)
>           if (g_str_equal(obj->name, "rng0") &&
>               g_str_equal(obj->type, "child<rng-builtin>")) {
>               seen_rng = true;
> +            break;
>           }
>   
>           tmp = tmp->next;
> @@ -164,7 +164,7 @@ static void test_object_rng(void)
>           "id = \"rng0\"\n";
>   
>       qts = qtest_init_with_config(cfgdata);
> -   /* Test valid command */
> +    /* Test valid command */
>       resp = qtest_qmp(qts,
>                        "{ 'execute': 'qom-list',"
>                        "  'arguments': {'path': '/objects' }}");

Reviewed-by: Thomas Huth <thuth@redhat.com>

Re: [PATCH] tests/qtest: misc tweaks to readconfig

Posted by Marc-André Lureau 3 years, 6 months ago

On Tue, Aug 9, 2022 at 1:39 PM Daniel P. Berrangé <berrange@redhat.com>
wrote:

> The property name parameter is ignored when visiting a top
> level type, but the obvious typo should be fixed to avoid
> confusion. A few indentation issues were tidied up. We
> can break out of the loop when finding the RNG device.
> Finally, close the temp FD immediately when no longer
> needed.
>
> Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
>

Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>


> ---
>  tests/qtest/readconfig-test.c | 12 ++++++------
>  1 file changed, 6 insertions(+), 6 deletions(-)
>
> diff --git a/tests/qtest/readconfig-test.c b/tests/qtest/readconfig-test.c
> index 2e604d7c2d..c7a9b0c7dd 100644
> --- a/tests/qtest/readconfig-test.c
> +++ b/tests/qtest/readconfig-test.c
> @@ -33,13 +33,12 @@ static QTestState *qtest_init_with_config(const char
> *cfgdata)
>      g_assert_cmpint(cfgfd, >=, 0);
>
>      ret = qemu_write_full(cfgfd, cfgdata, strlen(cfgdata));
> +    close(cfgfd);
>      if (ret < 0) {
>          unlink(cfgpath);
>      }
>      g_assert_cmpint(ret, ==, strlen(cfgdata));
>
> -    close(cfgfd);
> -
>      args = g_strdup_printf("-nodefaults -machine none -readconfig %s",
> cfgpath);
>
>      qts = qtest_init(args);
> @@ -79,7 +78,7 @@ static void test_x86_memdev(void)
>          "size = \"200\"";
>
>      qts = qtest_init_with_config(cfgdata);
> -   /* Test valid command */
> +    /* Test valid command */
>      resp = qtest_qmp(qts, "{ 'execute': 'query-memdev' }");
>      test_x86_memdev_resp(qdict_get(resp, "return"));
>      qobject_unref(resp);
> @@ -96,7 +95,7 @@ static void test_spice_resp(QObject *res)
>
>      g_assert(res);
>      v = qobject_input_visitor_new(res);
> -    visit_type_SpiceInfo(v, "spcie", &spice, &error_abort);
> +    visit_type_SpiceInfo(v, "spice", &spice, &error_abort);
>
>      g_assert(spice);
>      g_assert(spice->enabled);
> @@ -114,7 +113,7 @@ static void test_spice(void)
>          "unix = \"on\"\n";
>
>      qts = qtest_init_with_config(cfgdata);
> -   /* Test valid command */
> +    /* Test valid command */
>      resp = qtest_qmp(qts, "{ 'execute': 'query-spice' }");
>      test_spice_resp(qdict_get(resp, "return"));
>      qobject_unref(resp);
> @@ -144,6 +143,7 @@ static void test_object_rng_resp(QObject *res)
>          if (g_str_equal(obj->name, "rng0") &&
>              g_str_equal(obj->type, "child<rng-builtin>")) {
>              seen_rng = true;
> +            break;
>          }
>
>          tmp = tmp->next;
> @@ -164,7 +164,7 @@ static void test_object_rng(void)
>          "id = \"rng0\"\n";
>
>      qts = qtest_init_with_config(cfgdata);
> -   /* Test valid command */
> +    /* Test valid command */
>      resp = qtest_qmp(qts,
>                       "{ 'execute': 'qom-list',"
>                       "  'arguments': {'path': '/objects' }}");
> --
> 2.37.1
>
>
>

-- 
Marc-André Lureau