From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36319) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZhnOe-0001dq-60 for qemu-devel@nongnu.org; Thu, 01 Oct 2015 19:36:23 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZhnOZ-0006JZ-0w for qemu-devel@nongnu.org; Thu, 01 Oct 2015 19:36:20 -0400 Received: from e39.co.us.ibm.com ([32.97.110.160]:58811) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZhnOY-0006JV-OT for qemu-devel@nongnu.org; Thu, 01 Oct 2015 19:36:14 -0400 Received: from localhost by e39.co.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Thu, 1 Oct 2015 17:36:14 -0600 Received: from b01cxnp22033.gho.pok.ibm.com (b01cxnp22033.gho.pok.ibm.com [9.57.198.23]) by d01dlp02.pok.ibm.com (Postfix) with ESMTP id 9D7E76E803F for ; Thu, 1 Oct 2015 19:24:22 -0400 (EDT) Received: from d01av05.pok.ibm.com (d01av05.pok.ibm.com [9.56.224.195]) by b01cxnp22033.gho.pok.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id t91NaAn748496720 for ; Thu, 1 Oct 2015 23:36:10 GMT Received: from d01av05.pok.ibm.com (localhost [127.0.0.1]) by d01av05.pok.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id t91Na9Pn006856 for ; Thu, 1 Oct 2015 19:36:09 -0400 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable From: Michael Roth In-Reply-To: <841415431.21695592.1443738293222.JavaMail.zimbra@redhat.com> References: <1441997621-3284-1-git-send-email-marcandre.lureau@redhat.com> <1441997621-3284-5-git-send-email-marcandre.lureau@redhat.com> <20151001213621.32707.18265@loki> <841415431.21695592.1443738293222.JavaMail.zimbra@redhat.com> Message-ID: <20151001233602.32707.38763@loki> Date: Thu, 01 Oct 2015 18:36:02 -0500 Subject: Re: [Qemu-devel] [PATCH v2 4/4] tests: add a local test for guest agent List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= Cc: marcandre lureau , qemu-devel@nongnu.org Quoting Marc-Andr=C3=A9 Lureau (2015-10-01 17:24:53) > = > = > ----- Original Message ----- > > Quoting marcandre.lureau@redhat.com (2015-09-11 13:53:41) > > > From: Marc-Andr=C3=A9 Lureau > > > = > > > Add some local guest agent tests (as it is better than nothing) only > > > when CONFIG_LINUX. > > > = > > > They can be run inside or outside a VM, when run inside a VM, they wi= ll > > > do a bit more side effects, such as freezing/thawing the FS or changi= ng > > > the time. > > > = > > > A better test would involve a managed VM (or container), but it might= be > > > better to leave that off to autotest/avocado. > > > = > > > Signed-off-by: Marc-Andr=C3=A9 Lureau > > = > > Sorry for the delay in getting to this. Have some review comments but > > will make sure to stay on top of any follow-ups as I'm trying to get > > this into my next pull. > > = > > > --- > > > tests/Makefile | 3 + > > > tests/test-qga.c | 791 > > > +++++++++++++++++++++++++++++++++++++++++++++++++++++++ > > > 2 files changed, 794 insertions(+) > > > create mode 100644 tests/test-qga.c > > > = > > > diff --git a/tests/Makefile b/tests/Makefile > > > index 34c6136..d5837a4 100644 > > > --- a/tests/Makefile > > > +++ b/tests/Makefile > > > @@ -76,6 +76,7 @@ check-unit-y +=3D tests/test-write-threshold$(EXESU= F) > > > gcov-files-test-write-threshold-y =3D block/write-threshold.c > > > check-unit-$(CONFIG_GNUTLS_HASH) +=3D tests/test-crypto-hash$(EXESUF) > > > check-unit-y +=3D tests/test-crypto-cipher$(EXESUF) > > > +check-unit-$(CONFIG_LINUX) +=3D tests/test-qga$(EXESUF) > > > = > > > check-block-$(CONFIG_POSIX) +=3D tests/qemu-iotests-quick.sh > > > = > > > @@ -432,6 +433,8 @@ endif > > > qtest-obj-y =3D tests/libqtest.o libqemuutil.a libqemustub.a > > > $(check-qtest-y): $(qtest-obj-y) > > > = > > > +tests/test-qga: tests/test-qga.o $(qtest-obj-y) > > > + > > > .PHONY: check-help > > > check-help: > > > @echo "Regression testing targets:" > > > diff --git a/tests/test-qga.c b/tests/test-qga.c > > > new file mode 100644 > > > index 0000000..cfee134 > > > --- /dev/null > > > +++ b/tests/test-qga.c > > > @@ -0,0 +1,791 @@ > > > +#include > > > +#include > > > +#include > > > +#include > > > +#include > > > +#include > > > +#include > > > +#include > > > +#include > > > +#include > > > +#include > > > + > > > +#include "libqtest.h" > > > +#include "config-host.h" > > > + > > > +typedef struct { > > > + char *test_dir; > > > + GMainLoop *loop; > > > + int fd; > > > + GPid pid; > > > +} TestFixture; > > > + > > > +static int connect_qga(char *path) > > > +{ > > > + int s, ret, len, i =3D 0; > > > + struct sockaddr_un remote; > > > + > > > + s =3D socket(AF_UNIX, SOCK_STREAM, 0); > > > + g_assert(s !=3D -1); > > > + > > > + remote.sun_family =3D AF_UNIX; > > > + do { > > > + strcpy(remote.sun_path, path); > > > + len =3D strlen(remote.sun_path) + sizeof(remote.sun_family); > > > + ret =3D connect(s, (struct sockaddr *)&remote, len); > > > + if (ret =3D=3D -1) { > > > + g_usleep(G_USEC_PER_SEC); > > > + } > > > + if (i++ =3D=3D 5) { > > > + return -1; > > > + } > > > + } while (ret =3D=3D -1); > > > + > > > + return s; > > > +} > > > + > > > +static void qga_watch(GPid pid, gint status, gpointer user_data) > > > +{ > > > + TestFixture *fixture =3D user_data; > > > + > > > + g_assert_cmpint(status, =3D=3D, 0); > > > + g_main_loop_quit(fixture->loop); > > > +} > > > + > > > +static void > > > +fixture_setup(TestFixture *fixture, gconstpointer data) > > > +{ > > > + const gchar *extra_arg =3D data; > > > + GError *error =3D NULL; > > > + gchar *cwd, *path, *cmd, **argv =3D NULL; > > > + > > > + fixture->loop =3D g_main_loop_new(NULL, FALSE); > > > + > > > + fixture->test_dir =3D g_strdup("/tmp/qgatest.XXXXXX"); > > > + g_assert_nonnull(g_mkdtemp(fixture->test_dir)); > > > + > > > + path =3D g_build_filename(fixture->test_dir, "sock", NULL); > > > + cwd =3D g_get_current_dir(); > > > + cmd =3D g_strdup_printf("%s%cqemu-ga -m unix-listen -t %s -p %s = %s %s", > > > + cwd, G_DIR_SEPARATOR, > > > + fixture->test_dir, path, > > > + getenv("QTEST_LOG") ? "-v" : "", > > > + extra_arg ?: ""); > > > + g_shell_parse_argv(cmd, NULL, &argv, &error); > > > + g_assert_no_error(error); > > > + > > > + g_spawn_async(fixture->test_dir, argv, NULL, > > > + G_SPAWN_SEARCH_PATH|G_SPAWN_DO_NOT_REAP_CHILD, > > > + NULL, NULL, &fixture->pid, &error); > > > + g_assert_no_error(error); > > > + > > > + g_child_watch_add(fixture->pid, qga_watch, fixture); > > > + > > > + fixture->fd =3D connect_qga(path); > > > + > > > + g_strfreev(argv); > > > + g_free(cmd); > > > + g_free(cwd); > > > + g_free(path); > > > +} > > > + > > > +static void > > > +fixture_tear_down(TestFixture *fixture, gconstpointer data) > > > +{ > > > + gchar *tmp; > > > + > > > + kill(fixture->pid, SIGTERM); > > > + > > > + g_main_loop_run(fixture->loop); > > > + g_main_loop_unref(fixture->loop); > > > + > > > + g_spawn_close_pid(fixture->pid); > > > + > > > + tmp =3D g_build_filename(fixture->test_dir, "foo", NULL); > > > + g_unlink(tmp); > > > + g_free(tmp); > > > + > > > + tmp =3D g_build_filename(fixture->test_dir, "qga.state", NULL); > > > + g_unlink(tmp); > > > + g_free(tmp); > > > + > > > + tmp =3D g_build_filename(fixture->test_dir, "sock", NULL); > > > + g_unlink(tmp); > > > + g_free(tmp); > > > + > > > + g_rmdir(fixture->test_dir); > > > + g_free(fixture->test_dir); > > > +} > > > + > > > +static void qmp_assertion_message_error(const char *domain, > > > + const char *file, > > > + int line, > > > + const char *func, > > > + const char *expr, > > > + QDict *dict) > > > +{ > > > + const char *class, *desc; > > > + char *s; > > > + QDict *error; > > > + > > > + error =3D qdict_get_qdict(dict, "error"); > > > + class =3D qdict_get_try_str(error, "class"); > > > + desc =3D qdict_get_try_str(error, "desc"); > > > + > > > + s =3D g_strdup_printf("assertion failed %s: %s %s", expr, class,= desc); > > > + g_assertion_message(domain, file, line, func, s); > > > + g_free(s); > > > +} > > > + > > > +#define qmp_assert_no_error(err) do { = \ > > > + if (qdict_haskey(err, "error")) { = \ > > > + qmp_assertion_message_error(G_LOG_DOMAIN, __FILE__, __LINE__= , \ > > > + G_STRFUNC, #err, err); = \ > > > + } = \ > > > +} while (0) > > > + > > > +static void test_qga_sync_delimited(gconstpointer fix) > > > +{ > > > + const TestFixture *fixture =3D fix; > > > + guint32 v, r =3D g_random_int(); > > > + unsigned char c; > > > + QDict *ret; > > > + gchar *cmd; > > > + > > > + cmd =3D g_strdup_printf("%c{'execute': 'guest-sync-delimited'," > > > + " 'arguments': {'id': %u } }", 0xff, r); > > > + qmp_fd_send(fixture->fd, cmd); > > > + g_free(cmd); > > > + > > > + v =3D read(fixture->fd, &c, 1); > > > + g_assert_cmpint(v, =3D=3D, 1); > > > + g_assert_cmpint(c, =3D=3D, 0xff); > > > + > > > + ret =3D qmp_fd_receive(fixture->fd); > > > + g_assert_nonnull(ret); > > > + qmp_assert_no_error(ret); > > > + > > > + v =3D qdict_get_int(ret, "return"); > > > + g_assert_cmpint(r, =3D=3D, v); > > > + > > > + QDECREF(ret); > > > +} > > > + > > > +static void test_qga_sync(gconstpointer fix) > > > +{ > > > + const TestFixture *fixture =3D fix; > > > + guint32 v, r =3D g_random_int(); > > > + QDict *ret; > > > + gchar *cmd; > > > + > > > + cmd =3D g_strdup_printf("%c{'execute': 'guest-sync'," > > > + " 'arguments': {'id': %u } }", 0xff, r); > > > + ret =3D qmp_fd(fixture->fd, cmd); > > > + g_free(cmd); > > > + > > > + g_assert_nonnull(ret); > > > + qmp_assert_no_error(ret); > > > + > > > + v =3D qdict_get_int(ret, "return"); > > > + g_assert_cmpint(r, =3D=3D, v); > > > + > > > + QDECREF(ret); > > > +} > > > + > > > +static void test_qga_ping(gconstpointer fix) > > > +{ > > > + const TestFixture *fixture =3D fix; > > > + QDict *ret; > > > + > > > + ret =3D qmp_fd(fixture->fd, "{'execute': 'guest-ping'}"); > > > + g_assert_nonnull(ret); > > > + qmp_assert_no_error(ret); > > > + > > > + QDECREF(ret); > > > +} > > > + > > > +static void test_qga_invalid_cmd(gconstpointer fix) > > > +{ > > > + const TestFixture *fixture =3D fix; > > > + QDict *ret, *error; > > > + const gchar *class, *desc; > > > + > > > + ret =3D qmp_fd(fixture->fd, "{'execute': 'guest-invalid-cmd'}"); > > > + g_assert_nonnull(ret); > > > + > > > + error =3D qdict_get_qdict(ret, "error"); > > > + class =3D qdict_get_try_str(error, "class"); > > > + desc =3D qdict_get_try_str(error, "desc"); > > > + > > > + g_assert_cmpstr(class, =3D=3D, "CommandNotFound"); > > > + g_assert_cmpint(strlen(desc), >, 0); > > > + > > > + QDECREF(ret); > > > +} > > > + > > > +static void test_qga_info(gconstpointer fix) > > > +{ > > > + const TestFixture *fixture =3D fix; > > > + QDict *ret, *val; > > > + const gchar *version; > > > + > > > + ret =3D qmp_fd(fixture->fd, "{'execute': 'guest-info'}"); > > > + g_assert_nonnull(ret); > > > + qmp_assert_no_error(ret); > > > + > > > + val =3D qdict_get_qdict(ret, "return"); > > > + version =3D qdict_get_try_str(val, "version"); > > > + g_assert_cmpstr(version, =3D=3D, QEMU_VERSION); > > > + > > > + QDECREF(ret); > > > +} > > > + > > > +static void test_qga_get_vcpus(gconstpointer fix) > > > +{ > > > + const TestFixture *fixture =3D fix; > > > + QDict *ret; > > > + QList *list; > > > + const QListEntry *entry; > > > + > > > + ret =3D qmp_fd(fixture->fd, "{'execute': 'guest-get-vcpus'}"); > > > + g_assert_nonnull(ret); > > > + qmp_assert_no_error(ret); > > > + > > > + /* check there is at least a cpu */ > > > + list =3D qdict_get_qlist(ret, "return"); > > > + entry =3D qlist_first(list); > > > + g_assert(qdict_haskey(qobject_to_qdict(entry->value), "online")); > > > + g_assert(qdict_haskey(qobject_to_qdict(entry->value), "logical-i= d")); > > > + > > > + QDECREF(ret); > > > +} > > > + > > > +static void test_qga_get_fsinfo(gconstpointer fix) > > > +{ > > > + const TestFixture *fixture =3D fix; > > > + QDict *ret; > > > + QList *list; > > > + const QListEntry *entry; > > > + > > > + ret =3D qmp_fd(fixture->fd, "{'execute': 'guest-get-fsinfo'}"); > > > + g_assert_nonnull(ret); > > > + qmp_assert_no_error(ret); > > > + > > > + /* check there is at least a fs */ > > > + list =3D qdict_get_qlist(ret, "return"); > > > + entry =3D qlist_first(list); > > > + g_assert(qdict_haskey(qobject_to_qdict(entry->value), "name")); > > > + g_assert(qdict_haskey(qobject_to_qdict(entry->value), "mountpoin= t")); > > > + g_assert(qdict_haskey(qobject_to_qdict(entry->value), "type")); > > > + g_assert(qdict_haskey(qobject_to_qdict(entry->value), "disk")); > > > + > > > + QDECREF(ret); > > > +} > > > + > > > +static void test_qga_get_memory_block_info(gconstpointer fix) > > > +{ > > > + const TestFixture *fixture =3D fix; > > > + QDict *ret, *val; > > > + int64_t size; > > > + > > > + ret =3D qmp_fd(fixture->fd, "{'execute': > > > 'guest-get-memory-block-info'}"); > > > + g_assert_nonnull(ret); > > > + qmp_assert_no_error(ret); > > > + > > > + /* check there is at least some memory */ > > > + val =3D qdict_get_qdict(ret, "return"); > > > + size =3D qdict_get_int(val, "size"); > > > + g_assert_cmpint(size, >, 0); > > > + > > > + QDECREF(ret); > > > +} > > > + > > > +static void test_qga_get_memory_blocks(gconstpointer fix) > > > +{ > > > + const TestFixture *fixture =3D fix; > > > + QDict *ret; > > > + QList *list; > > > + const QListEntry *entry; > > > + > > > + ret =3D qmp_fd(fixture->fd, "{'execute': 'guest-get-memory-block= s'}"); > > > + g_assert_nonnull(ret); > > > + qmp_assert_no_error(ret); > > > + > > > + list =3D qdict_get_qlist(ret, "return"); > > > + entry =3D qlist_first(list); > > > + g_assert(qdict_haskey(qobject_to_qdict(entry->value), "phys-inde= x")); > > > + g_assert(qdict_haskey(qobject_to_qdict(entry->value), "online")); > > > + > > > + QDECREF(ret); > > > +} > > > + > > > +static void test_qga_network_get_interfaces(gconstpointer fix) > > > +{ > > > + const TestFixture *fixture =3D fix; > > > + QDict *ret; > > > + QList *list; > > > + const QListEntry *entry; > > > + > > > + ret =3D qmp_fd(fixture->fd, "{'execute': > > > 'guest-network-get-interfaces'}"); > > > + g_assert_nonnull(ret); > > > + qmp_assert_no_error(ret); > > > + > > > + /* check there is at least a cpu */ > > = > > copy/paste error > > = > > > + list =3D qdict_get_qlist(ret, "return"); > > > + entry =3D qlist_first(list); > > > + g_assert(qdict_haskey(qobject_to_qdict(entry->value), "name")); > > > + > > > + QDECREF(ret); > > > +} > > > + > > > +static void test_qga_file_ops(gconstpointer fix) > > > +{ > > > + const TestFixture *fixture =3D fix; > > > + gchar *cmd, *path; > > > + const gchar *b64; > > > + QDict *ret, *val; > > > + int64_t id, count, eof; > > > + FILE *f; > > > + char tmp[100]; > > > + > > > + /* open */ > > > + ret =3D qmp_fd(fixture->fd, "{'execute': 'guest-file-open'," > > > + " 'arguments': { 'path': 'foo', 'mode': 'w+' } }"); > > > + g_assert_nonnull(ret); > > > + qmp_assert_no_error(ret); > > > + id =3D qdict_get_int(ret, "return"); > > > + QDECREF(ret); > > > + > > > + /* write */ > > > + cmd =3D g_strdup_printf("{'execute': 'guest-file-write'," > > > + " 'arguments': { 'handle': %" G_GINT64_FOR= MAT > > > "," > > > + " 'buf-b64': 'aGVsbG8gd29ybGQK' } }", id); > > = > > base64 encoding the string here would be more readible, or at least just > > a comment that it's a b64 "hello world". A separate variable/constant to > > store it so it's not manually duplicated below would be good too in case > > we ever wanted to change it to check some fringe case with encodings. > > = > > > + ret =3D qmp_fd(fixture->fd, cmd); > > > + g_assert_nonnull(ret); > > > + qmp_assert_no_error(ret); > > > + > > > + val =3D qdict_get_qdict(ret, "return"); > > > + count =3D qdict_get_int(val, "count"); > > > + eof =3D qdict_get_bool(val, "eof"); > > > + g_assert_cmpint(count, =3D=3D, 12); > > > + g_assert_cmpint(eof, =3D=3D, 0); > > > + QDECREF(ret); > > > + g_free(cmd); > > > + > > > + /* flush */ > > > + cmd =3D g_strdup_printf("{'execute': 'guest-file-flush'," > > > + " 'arguments': {'handle': %" G_GINT64_FORM= AT "} > > > }", > > > + id); > > > + ret =3D qmp_fd(fixture->fd, cmd); > > > + QDECREF(ret); > > > + g_free(cmd); > > > + > > > + /* close */ > > > + cmd =3D g_strdup_printf("{'execute': 'guest-file-close'," > > > + " 'arguments': {'handle': %" G_GINT64_FORM= AT "} > > > }", > > > + id); > > > + ret =3D qmp_fd(fixture->fd, cmd); > > > + QDECREF(ret); > > > + g_free(cmd); > > > + > > > + /* check content */ > > > + path =3D g_build_filename(fixture->test_dir, "foo", NULL); > > > + f =3D fopen(path, "r"); > > > + g_assert_nonnull(f); > > > + count =3D fread(tmp, 1, sizeof(tmp), f); > > > + g_assert_cmpint(count, =3D=3D, 12); > > > + tmp[count] =3D 0; > > > + g_assert_cmpstr(tmp, =3D=3D, "hello world\n"); > > > + fclose(f); > > > + > > > + /* open */ > > > + ret =3D qmp_fd(fixture->fd, "{'execute': 'guest-file-open'," > > > + " 'arguments': { 'path': 'foo', 'mode': 'r' } }"); > > > + g_assert_nonnull(ret); > > > + qmp_assert_no_error(ret); > > > + id =3D qdict_get_int(ret, "return"); > > > + QDECREF(ret); > > > + > > > + /* read */ > > > + cmd =3D g_strdup_printf("{'execute': 'guest-file-read'," > > > + " 'arguments': { 'handle': %" G_GINT64_FOR= MAT "} > > > }", > > > + id); > > > + ret =3D qmp_fd(fixture->fd, cmd); > > > + val =3D qdict_get_qdict(ret, "return"); > > > + count =3D qdict_get_int(val, "count"); > > > + eof =3D qdict_get_bool(val, "eof"); > > > + b64 =3D qdict_get_str(val, "buf-b64"); > > > + g_assert_cmpint(count, =3D=3D, 12); > > > + g_assert(eof); > > > + g_assert_cmpstr(b64, =3D=3D, "aGVsbG8gd29ybGQK"); > > > + > > > + QDECREF(ret); > > > + g_free(cmd); > > > + > > > + /* read eof */ > > > + cmd =3D g_strdup_printf("{'execute': 'guest-file-read'," > > > + " 'arguments': { 'handle': %" G_GINT64_FOR= MAT "} > > > }", > > > + id); > > > + ret =3D qmp_fd(fixture->fd, cmd); > > > + val =3D qdict_get_qdict(ret, "return"); > > > + count =3D qdict_get_int(val, "count"); > > > + eof =3D qdict_get_bool(val, "eof"); > > > + b64 =3D qdict_get_str(val, "buf-b64"); > > > + g_assert_cmpint(count, =3D=3D, 0); > > > + g_assert(eof); > > > + g_assert_cmpstr(b64, =3D=3D, ""); > > > + QDECREF(ret); > > > + g_free(cmd); > > > + > > > + /* seek */ > > > + cmd =3D g_strdup_printf("{'execute': 'guest-file-seek'," > > > + " 'arguments': { 'handle': %" G_GINT64_FOR= MAT ", > > > " > > > + " 'offset': %d, 'whence': %d } }", > > > + id, 6, SEEK_SET); > > > + ret =3D qmp_fd(fixture->fd, cmd); > > > + qmp_assert_no_error(ret); > > > + val =3D qdict_get_qdict(ret, "return"); > > > + count =3D qdict_get_int(val, "position"); > > > + eof =3D qdict_get_bool(val, "eof"); > > > + g_assert_cmpint(count, =3D=3D, 6); > > > + g_assert(!eof); > > > + QDECREF(ret); > > > + g_free(cmd); > > > + > > > + /* partial read */ > > > + cmd =3D g_strdup_printf("{'execute': 'guest-file-read'," > > > + " 'arguments': { 'handle': %" G_GINT64_FOR= MAT "} > > > }", > > > + id); > > > + ret =3D qmp_fd(fixture->fd, cmd); > > > + val =3D qdict_get_qdict(ret, "return"); > > > + count =3D qdict_get_int(val, "count"); > > > + eof =3D qdict_get_bool(val, "eof"); > > > + b64 =3D qdict_get_str(val, "buf-b64"); > > > + g_assert_cmpint(count, =3D=3D, 6); > > > + g_assert(eof); > > > + g_assert_cmpstr(b64, =3D=3D, "d29ybGQK"); > > = > > This makes me think doing the b64 encode/decodes here would be a lot > > easier, especially given that offsets are relative to the plaintext. > > = > > > + > > > + QDECREF(ret); > > > + g_free(cmd); > > > + > > > + /* close */ > > > + cmd =3D g_strdup_printf("{'execute': 'guest-file-close'," > > > + " 'arguments': {'handle': %" G_GINT64_FORM= AT "} > > > }", > > > + id); > > > + ret =3D qmp_fd(fixture->fd, cmd); > > > + QDECREF(ret); > > > + g_free(cmd); > > > +} > > > + > > > +static void test_qga_get_time(gconstpointer fix) > > > +{ > > > + const TestFixture *fixture =3D fix; > > > + QDict *ret; > > > + int64_t time; > > > + > > > + ret =3D qmp_fd(fixture->fd, "{'execute': 'guest-get-time'}"); > > > + g_assert_nonnull(ret); > > > + qmp_assert_no_error(ret); > > > + > > > + time =3D qdict_get_int(ret, "return"); > > > + g_assert_cmpint(time, >, 0); > > > + > > > + QDECREF(ret); > > > +} > > > + > > > +static void test_qga_set_time(gconstpointer fix) > > > +{ > > > + const TestFixture *fixture =3D fix; > > > + QDict *ret; > > > + int64_t current, time; > > > + gchar *cmd; > > > + > > > + /* get current time */ > > > + ret =3D qmp_fd(fixture->fd, "{'execute': 'guest-get-time'}"); > > > + g_assert_nonnull(ret); > > > + qmp_assert_no_error(ret); > > > + current =3D qdict_get_int(ret, "return"); > > > + g_assert_cmpint(current, >, 0); > > > + QDECREF(ret); > > > + > > > + /* set some old time */ > > > + ret =3D qmp_fd(fixture->fd, "{'execute': 'guest-set-time'," > > > + " 'arguments': { 'time': 1000 } }"); > > > + g_assert_nonnull(ret); > > > + qmp_assert_no_error(ret); > > > + QDECREF(ret); > > > + > > > + /* check old time */ > > > + ret =3D qmp_fd(fixture->fd, "{'execute': 'guest-get-time'}"); > > > + g_assert_nonnull(ret); > > > + qmp_assert_no_error(ret); > > > + time =3D qdict_get_int(ret, "return"); > > > + g_assert_cmpint(time / 1000, <, G_USEC_PER_SEC * 10); > > > + QDECREF(ret); > > > + > > > + /* set back current time */ > > > + cmd =3D g_strdup_printf("{'execute': 'guest-set-time'," > > > + " 'arguments': { 'time': %" G_GINT64_FORMA= T " } > > > }", > > > + current + time * 1000); > > > + ret =3D qmp_fd(fixture->fd, cmd); > > > + g_free(cmd); > > > + g_assert_nonnull(ret); > > > + qmp_assert_no_error(ret); > > > + QDECREF(ret); > > > +} > > > + > > > +static void test_qga_fstrim(gconstpointer fix) > > > +{ > > > + const TestFixture *fixture =3D fix; > > > + QDict *ret; > > > + QList *list; > > > + const QListEntry *entry; > > > + > > > + ret =3D qmp_fd(fixture->fd, "{'execute': 'guest-fstrim'," > > > + " arguments: { minimum: 4194304 } }"); > > > + g_assert_nonnull(ret); > > > + qmp_assert_no_error(ret); > > > + list =3D qdict_get_qlist(ret, "return"); > > > + entry =3D qlist_first(list); > > > + g_assert(qdict_haskey(qobject_to_qdict(entry->value), "paths")); > > > + > > > + QDECREF(ret); > > > +} > > > + > > > +static void test_qga_blacklist(gconstpointer data) > > > +{ > > > + TestFixture fix; > > > + QDict *ret, *error; > > > + const gchar *class, *desc; > > > + > > > + fixture_setup(&fix, "-b guest-ping,guest-get-time"); > > > + > > > + /* check blacklist */ > > > + ret =3D qmp_fd(fix.fd, "{'execute': 'guest-ping'}"); > > > + g_assert_nonnull(ret); > > > + error =3D qdict_get_qdict(ret, "error"); > > > + class =3D qdict_get_try_str(error, "class"); > > > + desc =3D qdict_get_try_str(error, "desc"); > > > + g_assert_cmpstr(class, =3D=3D, "GenericError"); > > > + g_assert_nonnull(g_strstr_len(desc, -1, "has been disabled")); > > > + QDECREF(ret); > > > + > > > + ret =3D qmp_fd(fix.fd, "{'execute': 'guest-get-time'}"); > > > + g_assert_nonnull(ret); > > > + error =3D qdict_get_qdict(ret, "error"); > > > + class =3D qdict_get_try_str(error, "class"); > > > + desc =3D qdict_get_try_str(error, "desc"); > > > + g_assert_cmpstr(class, =3D=3D, "GenericError"); > > > + g_assert_nonnull(g_strstr_len(desc, -1, "has been disabled")); > > > + QDECREF(ret); > > > + > > > + /* check something work */ > > > + ret =3D qmp_fd(fix.fd, "{'execute': 'guest-get-fsinfo'}"); > > > + qmp_assert_no_error(ret); > > > + QDECREF(ret); > > > + > > > + fixture_tear_down(&fix, NULL); > > > +} > > > + > > > +#if !GLIB_CHECK_VERSION(2, 38, 0) > > > +#define g_assert_true(E) g_assert(E) > > > +#define g_assert_false(E) g_assert(!E) > > > +#endif > > > + > > > +static void test_qga_config(gconstpointer data) > > > +{ > > > + GError *error =3D NULL; > > > + char *cwd, *cmd, *out, *err, *str, **strv, *conf, **argv =3D NUL= L; > > > + char *env[2]; > > > + int status, tmp; > > > + gsize n; > > > + GKeyFile *kf; > > > + const char *qga_config =3D > > > + "[general]\n" > > > + "daemon=3Dfalse\n" > > > + "method=3Dvirtio-serial\n" > > > + "path=3D/path/to/org.qemu.guest_agent.0\n" > > > + "pidfile=3D/var/foo/qemu-ga.pid\n" > > > + "statedir=3D/var/state\n" > > > + "verbose=3Dtrue\n" > > > + "blacklist=3Dguest-ping;guest-get-time\n"; > > > + > > > + tmp =3D g_file_open_tmp(NULL, &conf, &error); > > > + g_assert_no_error(error); > > > + g_assert_cmpint(tmp, >=3D, 0); > > > + g_assert_cmpstr(conf, !=3D, ""); > > > + > > > + g_file_set_contents(conf, qga_config, -1, &error); > > > + g_assert_no_error(error); > > > + > > > + cwd =3D g_get_current_dir(); > > > + cmd =3D g_strdup_printf("%s%cqemu-ga -D", > > > + cwd, G_DIR_SEPARATOR); > > > + g_shell_parse_argv(cmd, NULL, &argv, &error); > > > + g_assert_no_error(error); > > > + > > > + env[0] =3D g_strdup_printf("QGA_CONF=3D%s", conf); > > > + env[1] =3D NULL; > > > + g_spawn_sync(NULL, argv, env, G_SPAWN_DEFAULT, > > > + NULL, NULL, &out, &err, &status, &error); > > > + g_assert_no_error(error); > > > + g_assert_cmpstr(err, =3D=3D, ""); > > > + g_assert_cmpint(status, =3D=3D, 0); > > > + > > > + kf =3D g_key_file_new(); > > > + g_key_file_load_from_data(kf, out, -1, G_KEY_FILE_NONE, &error); > > > + g_assert_no_error(error); > > > + > > > + str =3D g_key_file_get_start_group(kf); > > > + g_assert_cmpstr(str, =3D=3D, "general"); > > > + g_free(str); > > > + > > > + g_assert_false(g_key_file_get_boolean(kf, "general", "daemon", > > > &error)); > > > + g_assert_no_error(error); > > > + > > > + str =3D g_key_file_get_string(kf, "general", "method", &error); > > > + g_assert_no_error(error); > > > + g_assert_cmpstr(str, =3D=3D, "virtio-serial"); > > > + g_free(str); > > > + > > > + str =3D g_key_file_get_string(kf, "general", "path", &error); > > > + g_assert_no_error(error); > > > + g_assert_cmpstr(str, =3D=3D, "/path/to/org.qemu.guest_agent.0"); > > > + g_free(str); > > > + > > > + str =3D g_key_file_get_string(kf, "general", "pidfile", &error); > > > + g_assert_no_error(error); > > > + g_assert_cmpstr(str, =3D=3D, "/var/foo/qemu-ga.pid"); > > > + g_free(str); > > > + > > > + str =3D g_key_file_get_string(kf, "general", "statedir", &error); > > > + g_assert_no_error(error); > > > + g_assert_cmpstr(str, =3D=3D, "/var/state"); > > > + g_free(str); > > > + > > > + g_assert_true(g_key_file_get_boolean(kf, "general", "verbose", > > > &error)); > > > + g_assert_no_error(error); > > > + > > > + strv =3D g_key_file_get_string_list(kf, "general", "blacklist", = &n, > > > &error); > > > + g_assert_cmpint(n, =3D=3D, 2); > > > +#if GLIB_CHECK_VERSION(2, 44, 0) > > > + g_assert_true(g_strv_contains((const char * const *)strv, > > > + "guest-ping")); > > > + g_assert_true(g_strv_contains((const char * const *)strv, > > > + "guest-get-time")); > > > +#endif > > > + g_assert_no_error(error); > > > + g_strfreev(strv); > > > + > > > + g_free(out); > > > + g_free(err); > > > + g_free(conf); > > > + g_free(env[0]); > > > + g_key_file_free(kf); > > > + > > > + close(tmp); > > > +} > > > + > > > +static void test_qga_fsfreeze_status(gconstpointer fix) > > > +{ > > > + const TestFixture *fixture =3D fix; > > > + QDict *ret; > > > + const gchar *status; > > > + > > > + ret =3D qmp_fd(fixture->fd, "{'execute': 'guest-fsfreeze-status'= }"); > > > + g_assert_nonnull(ret); > > > + qmp_assert_no_error(ret); > > > + > > > + status =3D qdict_get_try_str(ret, "return"); > > > + g_assert_cmpstr(status, =3D=3D, "thawed"); > > > + > > > + QDECREF(ret); > > > +} > > > + > > > +static void test_qga_fsfreeze_and_thaw(gconstpointer fix) > > > +{ > > > + const TestFixture *fixture =3D fix; > > > + QDict *ret; > > > + const gchar *status; > > > + > > > + ret =3D qmp_fd(fixture->fd, "{'execute': 'guest-fsfreeze-freeze'= }"); > > > + g_assert_nonnull(ret); > > > + qmp_assert_no_error(ret); > > > + QDECREF(ret); > > > + > > > + ret =3D qmp_fd(fixture->fd, "{'execute': 'guest-fsfreeze-status'= }"); > > > + g_assert_nonnull(ret); > > > + qmp_assert_no_error(ret); > > > + status =3D qdict_get_try_str(ret, "return"); > > > + g_assert_cmpstr(status, =3D=3D, "frozen"); > > > + QDECREF(ret); > > > + > > > + ret =3D qmp_fd(fixture->fd, "{'execute': 'guest-fsfreeze-thaw'}"= ); > > > + g_assert_nonnull(ret); > > > + qmp_assert_no_error(ret); > > > + QDECREF(ret); > > > +} > > > + > > > +static gboolean running_in_virt(const gchar *virt) > > > +{ > > > + gchar *virt_what =3D NULL; > > > + gchar *err =3D NULL; > > > + gint status; > > > + gboolean success; > > > + > > > + success =3D g_spawn_command_line_sync("virt-what", &virt_what, &= err, > > > + &status, NULL); > > > + > > > + success =3D success && status =3D=3D 0 && > > > + g_strcmp0(g_strstrip(virt_what), virt) =3D=3D 0; > > > + > > > + g_free(virt_what); > > > + g_free(err); > > > + > > > + return success; > > > +} > > > +int main(int argc, char **argv) > > > +{ > > > + TestFixture fix; > > > + int ret; > > > + > > > + setlocale (LC_ALL, ""); > > > + g_test_init(&argc, &argv, NULL); > > > + fixture_setup(&fix, NULL); > > > + > > > + g_test_add_data_func("/qga/sync-delimited", &fix, > > > test_qga_sync_delimited); > > > + g_test_add_data_func("/qga/sync", &fix, test_qga_sync); > > > + g_test_add_data_func("/qga/ping", &fix, test_qga_ping); > > > + g_test_add_data_func("/qga/info", &fix, test_qga_info); > > > + g_test_add_data_func("/qga/network-get-interfaces", &fix, > > > + test_qga_network_get_interfaces); > > > + g_test_add_data_func("/qga/get-vcpus", &fix, test_qga_get_vcpus); > > > + g_test_add_data_func("/qga/get-fsinfo", &fix, test_qga_get_fsinf= o); > > > + g_test_add_data_func("/qga/get-memory-block-info", &fix, > > > + test_qga_get_memory_block_info); > > > + g_test_add_data_func("/qga/get-memory-blocks", &fix, > > > + test_qga_get_memory_blocks); > > > + g_test_add_data_func("/qga/file-ops", &fix, test_qga_file_ops); > > > + g_test_add_data_func("/qga/get-time", &fix, test_qga_get_time); > > > + g_test_add_data_func("/qga/invalid-cmd", &fix, test_qga_invalid_= cmd); > > > + g_test_add_data_func("/qga/fsfreeze-status", &fix, > > > + test_qga_fsfreeze_status); > > > + > > > + g_test_add_data_func("/qga/blacklist", NULL, test_qga_blacklist); > > > + g_test_add_data_func("/qga/config", NULL, test_qga_config); > > > + > > > + if (running_in_virt("kvm")) { > > = > > I think we should go ahead and replace this with a QGA_TEST_SIDE_EFFECT= ING > > environment variable or something of the sort. It's not necessarily the > > case that a VM environment means we can do side-effecting tests. It > > could be an "official" build server or someone's primary development > = > But they wouldn't have root privileges though presumably. > = > > environment and fsfreeze can do some funky stuff if they aren't > > intentionally running it. > = > Sounds good to me. Would you pick this patch and make the required modifi= cation or do you want a resend? Actually, I just noticed g_assert_nonnull() was only added in 2.40, whereas our min is 2.22, so we'll need a wrapper for those. Can you go ahead and send a respin? We can probably leave the g_base64_decode/encode suggestion as a potential follow-up. > = > > = > > > + g_test_add_data_func("/qga/fsfreeze-and-thaw", &fix, > > > + test_qga_fsfreeze_and_thaw); > > > + g_test_add_data_func("/qga/set-time", &fix, test_qga_set_tim= e); > > > + if (g_test_thorough()) { > > > + g_test_add_data_func("/qga/fstrim", &fix, test_qga_fstri= m); > > > + } > > > + } > > > + > > > + ret =3D g_test_run(); > > > + > > > + fixture_tear_down(&fix, NULL); > > > + > > > + return ret; > > > +} > > > -- > > > 2.4.3 > > > = > > = > > = > = > thanks >=20