Commit 1e700f4c authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/mdroth/tags/qga-pull-2015-10-23-tag' into staging 



qemu-ga patch queue

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

# gpg: Signature made Fri 23 Oct 2015 15:01:47 BST using RSA key ID F108B584
# gpg: Good signature from "Michael Roth <flukshun@gmail.com>"
# gpg:                 aka "Michael Roth <mdroth@utexas.edu>"
# gpg:                 aka "Michael Roth <mdroth@linux.vnet.ibm.com>"

* remotes/mdroth/tags/qga-pull-2015-10-23-tag:
  tests: test-qga, loosen assumptions about host filesystems

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 147482ae b3e9e584

tests/test-qga.c

+7 −5
Original line number Diff line number Diff line
@@ -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);

    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);

}