[Qemu-devel] [PULL 0/1] qemu-ga patch queue (unbreak Travis-CI builds)

[Qemu-devel] [PULL 0/1] qemu-ga patch queue (unbreak Travis-CI builds)

[Michael Roth]

The following changes since commit 147482ae35b896808af68c0051ad86d3aae12979:

  Merge remote-tracking branch 'remotes/dgibson/tags/ppc-next-20151023' into staging (2015-10-23 13:09:09 +0100)

are available in the git repository at:


  git://github.com/mdroth/qemu.git tags/qga-pull-2015-10-23-tag

for you to fetch changes up to b3e9e584fcef49be8ca0c355d11030f0bf6231b0:

  tests: test-qga, loosen assumptions about host filesystems (2015-10-23 08:57:45 -0500)

----------------------------------------------------------------
qemu-ga patch queue

* unbreak qga-test unit test on travis-ci systems by not assuming a
  disk-based filesystem must be present

----------------------------------------------------------------
Michael Roth (1):
      tests: test-qga, loosen assumptions about host filesystems

 tests/test-qga.c | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

[Qemu-devel] [PULL 1/1] tests: test-qga, loosen assumptions about host filesystems

[Michael Roth]

QGA skips pseudo-filesystems when querying filesystems via
guest-get-fsinfo. On some hosts, such as travis-ci which uses
containers with simfs filesystems, QGA might not report *any*
filesystems. Our test case assumes there would be at least one,
leading to false error messages in these situations.

Instead, sanity-check values iff we get at least one filesystem.

Cc: Marc-André Lureau <marcandre.lureau@redhat.com>
Cc: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
---
 tests/test-qga.c | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/tests/test-qga.c b/tests/test-qga.c
index 0531c9f..6473846 100644
--- a/tests/test-qga.c
+++ b/tests/test-qga.c
@@ -273,13 +273,15 @@ static void test_qga_get_fsinfo(gconstpointer fix)
     g_assert_nonnull(ret);
     qmp_assert_no_error(ret);
 
-    /* check there is at least a fs */
+    /* sanity-check the response if there are any filesystems */
     list = qdict_get_qlist(ret, "return");
     entry = qlist_first(list);
-    g_assert(qdict_haskey(qobject_to_qdict(entry->value), "name"));
-    g_assert(qdict_haskey(qobject_to_qdict(entry->value), "mountpoint"));
-    g_assert(qdict_haskey(qobject_to_qdict(entry->value), "type"));
-    g_assert(qdict_haskey(qobject_to_qdict(entry->value), "disk"));
+    if (entry) {
+        g_assert(qdict_haskey(qobject_to_qdict(entry->value), "name"));
+        g_assert(qdict_haskey(qobject_to_qdict(entry->value), "mountpoint"));
+        g_assert(qdict_haskey(qobject_to_qdict(entry->value), "type"));
+        g_assert(qdict_haskey(qobject_to_qdict(entry->value), "disk"));
+    }
 
     QDECREF(ret);
 }
-- 
1.9.1

Re: [Qemu-devel] [PULL 0/1] qemu-ga patch queue (unbreak Travis-CI builds)

[Peter Maydell]

On 23 October 2015 at 15:07, Michael Roth <mdroth@linux.vnet.ibm.com> wrote:
> The following changes since commit 147482ae35b896808af68c0051ad86d3aae12979:
>
>   Merge remote-tracking branch 'remotes/dgibson/tags/ppc-next-20151023' into staging (2015-10-23 13:09:09 +0100)
>
> are available in the git repository at:
>
>
>   git://github.com/mdroth/qemu.git tags/qga-pull-2015-10-23-tag
>
> for you to fetch changes up to b3e9e584fcef49be8ca0c355d11030f0bf6231b0:
>
>   tests: test-qga, loosen assumptions about host filesystems (2015-10-23 08:57:45 -0500)
>
> ----------------------------------------------------------------
> qemu-ga patch queue
>
> * unbreak qga-test unit test on travis-ci systems by not assuming a
>   disk-based filesystem must be present
>
> ----------------------------------------------------------------
> Michael Roth (1):
>       tests: test-qga, loosen assumptions about host filesystems
>
>  tests/test-qga.c | 12 +++++++-----
>  1 file changed, 7 insertions(+), 5 deletions(-)

Applied, thanks.

-- PMM