From e3bfadeaac6a46966becef50302e2ad797c1977a Mon Sep 17 00:00:00 2001

From: Miroslav Rezanina <mrezanin@redhat.com>

Date: Thu, 19 Apr 2018 12:33:48 -0300

Subject: [PATCH 7/7] test-qga: add test for guest-get-osinfo

MIME-Version: 1.0

Content-Type: text/plain; charset=UTF-8

Content-Transfer-Encoding: 8bit

RH-Author: Miroslav Rezanina <mrezanin@redhat.com>

Message-id: <4fbd9f39de7c623e464fe5a2fe36b6aa254218ac.1524139831.git.mrezanin@redhat.com>

Patchwork-id: 79709

O-Subject: [RHEL-7.5.z qemu-guest-agent PATCH 7/7] test-qga: add test for guest-get-osinfo

Bugzilla: 1598210

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

RH-Acked-by: Stefan Hajnoczi <stefanha@redhat.com>

RH-Acked-by: Tomáš Golembiovský <tgolembi@redhat.com>

From: Tomáš Golembiovský <tgolembi@redhat.com>

Add test for guest-get-osinfo command.

Qemu-ga was modified to accept QGA_OS_RELEASE environment variable. If

the variable is defined it is interpreted as path to the os-release file

and it is parsed instead of the default paths.

Signed-off-by: Tomáš Golembiovský <tgolembi@redhat.com>

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

* move declarations to beginning of functions

Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>

(cherry picked from commit 339ca68bef9f30dd18e84b7d92398327e3f819a3)

Signed-off-by: Wainer dos Santos Moschetta <wainersm@redhat.com>

---

 qga/commands-posix.c           | 13 +++++++---

 tests/data/test-qga-os-release |  7 ++++++

 tests/test-qga.c               | 56 ++++++++++++++++++++++++++++++++++++++++++

 3 files changed, 72 insertions(+), 4 deletions(-)

 create mode 100644 tests/data/test-qga-os-release

diff --git a/qga/commands-posix.c b/qga/commands-posix.c

index add8a51f2b..8c38dd3f0a 100644

--- a/qga/commands-posix.c

+++ b/qga/commands-posix.c

@@ -2677,7 +2677,8 @@ GuestOSInfo *qmp_guest_get_osinfo(Error **errp)

 {

     GuestOSInfo *info = NULL;

     struct utsname kinfo;

-    GKeyFile *osrelease;

+    GKeyFile *osrelease = NULL;

+    const char *qga_os_release = g_getenv("QGA_OS_RELEASE");

     info = g_new0(GuestOSInfo, 1);

@@ -2692,9 +2693,13 @@ GuestOSInfo *qmp_guest_get_osinfo(Error **errp)

         info->machine = g_strdup(kinfo.machine);

     }

-    osrelease = ga_parse_osrelease("/etc/os-release");

-    if (osrelease == NULL) {

-        osrelease = ga_parse_osrelease("/usr/lib/os-release");

+    if (qga_os_release != NULL) {

+        osrelease = ga_parse_osrelease(qga_os_release);

+    } else {

+        osrelease = ga_parse_osrelease("/etc/os-release");

+        if (osrelease == NULL) {

+            osrelease = ga_parse_osrelease("/usr/lib/os-release");

+        }

     }

     if (osrelease != NULL) {

diff --git a/tests/data/test-qga-os-release b/tests/data/test-qga-os-release

new file mode 100644

index 0000000000..70664eb6ec

--- /dev/null

+++ b/tests/data/test-qga-os-release

@@ -0,0 +1,7 @@

+ID=qemu-ga-test

+NAME=QEMU-GA

+PRETTY_NAME="QEMU Guest Agent test"

+VERSION="Test 1"

+VERSION_ID=1

+VARIANT="Unit test \"\'\$\`\\ and \\\\ etc."

+VARIANT_ID=unit-test

diff --git a/tests/test-qga.c b/tests/test-qga.c

index ef8616f89d..3542a015a5 100644

--- a/tests/test-qga.c

+++ b/tests/test-qga.c

@@ -909,6 +909,60 @@ static void test_qga_guest_exec_invalid(gconstpointer fix)

     QDECREF(ret);

 }

+static void test_qga_guest_get_osinfo(gconstpointer data)

+{

+    TestFixture fixture;

+    const gchar *str;

+    gchar *cwd, *env[2];

+    QDict *ret, *val;

+

+    cwd = g_get_current_dir();

+    env[0] = g_strdup_printf(

+        "QGA_OS_RELEASE=%s%ctests%cdata%ctest-qga-os-release",

+        cwd, G_DIR_SEPARATOR, G_DIR_SEPARATOR, G_DIR_SEPARATOR);

+    env[1] = NULL;

+    g_free(cwd);

+    fixture_setup(&fixture, NULL, env);

+

+    ret = qmp_fd(fixture.fd, "{'execute': 'guest-get-osinfo'}");

+    g_assert_nonnull(ret);

+    qmp_assert_no_error(ret);

+

+    val = qdict_get_qdict(ret, "return");

+

+    str = qdict_get_try_str(val, "id");

+    g_assert_nonnull(str);

+    g_assert_cmpstr(str, ==, "qemu-ga-test");

+

+    str = qdict_get_try_str(val, "name");

+    g_assert_nonnull(str);

+    g_assert_cmpstr(str, ==, "QEMU-GA");

+

+    str = qdict_get_try_str(val, "pretty-name");

+    g_assert_nonnull(str);

+    g_assert_cmpstr(str, ==, "QEMU Guest Agent test");

+

+    str = qdict_get_try_str(val, "version");

+    g_assert_nonnull(str);

+    g_assert_cmpstr(str, ==, "Test 1");

+

+    str = qdict_get_try_str(val, "version-id");

+    g_assert_nonnull(str);

+    g_assert_cmpstr(str, ==, "1");

+

+    str = qdict_get_try_str(val, "variant");

+    g_assert_nonnull(str);

+    g_assert_cmpstr(str, ==, "Unit test \"'$`\\ and \\\\ etc.");

+

+    str = qdict_get_try_str(val, "variant-id");

+    g_assert_nonnull(str);

+    g_assert_cmpstr(str, ==, "unit-test");

+

+    QDECREF(ret);

+    g_free(env[0]);

+    fixture_tear_down(&fixture, NULL);

+}

+

 int main(int argc, char **argv)

 {

     TestFixture fix;

@@ -943,6 +997,8 @@ int main(int argc, char **argv)

     g_test_add_data_func("/qga/guest-exec", &fix, test_qga_guest_exec);

     g_test_add_data_func("/qga/guest-exec-invalid", &fix,

                          test_qga_guest_exec_invalid);

+    g_test_add_data_func("/qga/guest-get-osinfo", &fix,

+                         test_qga_guest_get_osinfo);

     if (g_getenv("QGA_TEST_SIDE_EFFECTING")) {

         g_test_add_data_func("/qga/fsfreeze-and-thaw", &fix,

-- 

2.13.6