From: Michael Roth <mdroth@linux.vnet.ibm.com>
To: marcandre.lureau@redhat.com, qemu-devel@nongnu.org
Cc: yur@virtuozzo.com
Subject: Re: [Qemu-devel] [PATCHv2] tests: start a /qga/guest-exec test
Date: Tue, 07 Jun 2016 15:52:34 -0500 [thread overview]
Message-ID: <20160607205234.13720.88270@loki> (raw)
In-Reply-To: <1464956870-23772-1-git-send-email-marcandre.lureau@redhat.com>
Quoting marcandre.lureau@redhat.com (2016-06-03 07:27:50)
> From: Marc-André Lureau <marcandre.lureau@redhat.com>
>
> Test a few guest-exec guest agent commands, added in qemu 2.5.
>
> Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Thanks, applied to qga tree:
https://github.com/mdroth/qemu/tree/qga
> ---
> tests/test-qga.c | 81 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
> 1 file changed, 81 insertions(+)
>
> diff --git a/tests/test-qga.c b/tests/test-qga.c
> index 72a89de..10b29eb 100644
> --- a/tests/test-qga.c
> +++ b/tests/test-qga.c
> @@ -823,6 +823,84 @@ static void test_qga_fsfreeze_and_thaw(gconstpointer fix)
> QDECREF(ret);
> }
>
> +static void test_qga_guest_exec(gconstpointer fix)
> +{
> + const TestFixture *fixture = fix;
> + QDict *ret, *val;
> + const gchar *out;
> + guchar *decoded;
> + int64_t pid, now, exitcode;
> + gsize len;
> + bool exited;
> +
> + /* exec 'echo foo bar' */
> + ret = qmp_fd(fixture->fd, "{'execute': 'guest-exec', 'arguments': {"
> + " 'path': '/bin/echo', 'arg': [ '-n', '\" test_str \"' ],"
> + " 'capture-output': true } }");
> + g_assert_nonnull(ret);
> + qmp_assert_no_error(ret);
> + val = qdict_get_qdict(ret, "return");
> + pid = qdict_get_int(val, "pid");
> + g_assert_cmpint(pid, >, 0);
> + QDECREF(ret);
> +
> + /* wait for completion */
> + now = g_get_monotonic_time();
> + do {
> + ret = qmp_fd(fixture->fd, "{'execute': 'guest-exec-status',"
> + " 'arguments': { 'pid': %" PRId64 " } }", pid);
> + g_assert_nonnull(ret);
> + val = qdict_get_qdict(ret, "return");
> + exited = qdict_get_bool(val, "exited");
> + if (!exited) {
> + QDECREF(ret);
> + }
> + } while (!exited &&
> + g_get_monotonic_time() < now + 5 * G_TIME_SPAN_SECOND);
> + g_assert(exited);
> +
> + /* check stdout */
> + exitcode = qdict_get_int(val, "exitcode");
> + g_assert_cmpint(exitcode, ==, 0);
> + out = qdict_get_str(val, "out-data");
> + decoded = g_base64_decode(out, &len);
> + g_assert_cmpint(len, ==, 12);
> + g_assert_cmpstr((char *)decoded, ==, "\" test_str \"");
> + g_free(decoded);
> + QDECREF(ret);
> +}
> +
> +static void test_qga_guest_exec_invalid(gconstpointer fix)
> +{
> + const TestFixture *fixture = fix;
> + QDict *ret, *error;
> + const gchar *class, *desc;
> +
> + /* invalid command */
> + ret = qmp_fd(fixture->fd, "{'execute': 'guest-exec', 'arguments': {"
> + " 'path': '/bin/invalid-cmd42' } }");
> + g_assert_nonnull(ret);
> + error = qdict_get_qdict(ret, "error");
> + g_assert_nonnull(error);
> + class = qdict_get_str(error, "class");
> + desc = qdict_get_str(error, "desc");
> + g_assert_cmpstr(class, ==, "GenericError");
> + g_assert_cmpint(strlen(desc), >, 0);
> + QDECREF(ret);
> +
> + /* invalid pid */
> + ret = qmp_fd(fixture->fd, "{'execute': 'guest-exec-status',"
> + " 'arguments': { 'pid': 0 } }");
> + g_assert_nonnull(ret);
> + error = qdict_get_qdict(ret, "error");
> + g_assert_nonnull(error);
> + class = qdict_get_str(error, "class");
> + desc = qdict_get_str(error, "desc");
> + g_assert_cmpstr(class, ==, "GenericError");
> + g_assert_cmpint(strlen(desc), >, 0);
> + QDECREF(ret);
> +}
> +
> int main(int argc, char **argv)
> {
> TestFixture fix;
> @@ -853,6 +931,9 @@ int main(int argc, char **argv)
>
> g_test_add_data_func("/qga/blacklist", NULL, test_qga_blacklist);
> g_test_add_data_func("/qga/config", NULL, test_qga_config);
> + 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);
>
> if (g_getenv("QGA_TEST_SIDE_EFFECTING")) {
> g_test_add_data_func("/qga/fsfreeze-and-thaw", &fix,
> --
> 2.7.4
>
prev parent reply other threads:[~2016-06-07 20:52 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-06-03 12:27 [Qemu-devel] [PATCHv2] tests: start a /qga/guest-exec test marcandre.lureau
2016-06-07 20:52 ` Michael Roth [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20160607205234.13720.88270@loki \
--to=mdroth@linux.vnet.ibm.com \
--cc=marcandre.lureau@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=yur@virtuozzo.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).