From: Thomas Huth <thuth@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Peter Maydell" <peter.maydell@linaro.org>,
"Eric Blake" <eblake@redhat.com>,
"Dr. David Alan Gilbert" <dgilbert@redhat.com>,
"Peter Xu" <peterx@redhat.com>,
"Philippe Mathieu-Daudé" <f4bug@amsat.org>,
"John Snow" <jsnow@redhat.com>
Subject: [Qemu-devel] [PULL 5/9] test-qga: Kill broken and dead QGA_TEST_SIDE_EFFECTING code
Date: Fri, 15 Sep 2017 10:02:25 +0200 [thread overview]
Message-ID: <1505462549-27298-6-git-send-email-thuth@redhat.com> (raw)
In-Reply-To: <1505462549-27298-1-git-send-email-thuth@redhat.com>
From: Eric Blake <eblake@redhat.com>
Back when the test was introduced, in commit 62c39b307, the
test was set up to run qemu-ga directly on the host performing
the test, and defaults to limiting itself to safe commands. At
the time, it was envisioned that setting QGA_TEST_SIDE_EFFECTING
in the environment could cover a few more commands, while noting
the potential danger of those side effects running in the host.
But this has NEVER been tested: if you enable the environment
variable, the test WILL fail. One obvious reason: if you are not
running as root, you'll probably get a permission failure when
trying to freeze the file systems, or when changing system time.
Less obvious: if you run the test as root (wow, you're brave), you
could end up hanging if the test tries to log things to a
temporarily frozen filesystem. But the cutest reason of all: if
you get past the above hurdles, the test uses invalid JSON in
test_qga_fstrim() (missing '' around the dictionary key 'minimum'),
and will thus fail an assertion in qmp_fd().
Rather than leave this untested time-bomb in place, rip it out.
Hopefully, as originally envisioned, we can find an opportunity
to test an actual sandboxed guest where the guest-agent has
full permissions and will not unduly affect the host running
the test - if so, 'git revert' can be used if desired, for
salvaging any useful parts of this attempt.
Signed-off-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
tests/test-qga.c | 90 --------------------------------------------------------
1 file changed, 90 deletions(-)
diff --git a/tests/test-qga.c b/tests/test-qga.c
index 06783e7..fd6bc76 100644
--- a/tests/test-qga.c
+++ b/tests/test-qga.c
@@ -642,65 +642,6 @@ static void test_qga_get_time(gconstpointer fix)
QDECREF(ret);
}
-static void test_qga_set_time(gconstpointer fix)
-{
- const TestFixture *fixture = fix;
- QDict *ret;
- int64_t current, time;
- gchar *cmd;
-
- /* get current time */
- ret = qmp_fd(fixture->fd, "{'execute': 'guest-get-time'}");
- g_assert_nonnull(ret);
- qmp_assert_no_error(ret);
- current = qdict_get_int(ret, "return");
- g_assert_cmpint(current, >, 0);
- QDECREF(ret);
-
- /* set some old time */
- ret = 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 = qmp_fd(fixture->fd, "{'execute': 'guest-get-time'}");
- g_assert_nonnull(ret);
- qmp_assert_no_error(ret);
- time = qdict_get_int(ret, "return");
- g_assert_cmpint(time / 1000, <, G_USEC_PER_SEC * 10);
- QDECREF(ret);
-
- /* set back current time */
- cmd = g_strdup_printf("{'execute': 'guest-set-time',"
- " 'arguments': { 'time': %" PRId64 " } }",
- current + time * 1000);
- ret = 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 = fix;
- QDict *ret;
- QList *list;
- const QListEntry *entry;
-
- ret = qmp_fd(fixture->fd, "{'execute': 'guest-fstrim',"
- " arguments: { minimum: 4194304 } }");
- g_assert_nonnull(ret);
- qmp_assert_no_error(ret);
- list = qdict_get_qlist(ret, "return");
- entry = qlist_first(list);
- g_assert(qdict_haskey(qobject_to_qdict(entry->value), "paths"));
-
- QDECREF(ret);
-}
-
static void test_qga_blacklist(gconstpointer data)
{
TestFixture fix;
@@ -831,30 +772,6 @@ static void test_qga_fsfreeze_status(gconstpointer fix)
QDECREF(ret);
}
-static void test_qga_fsfreeze_and_thaw(gconstpointer fix)
-{
- const TestFixture *fixture = fix;
- QDict *ret;
- const gchar *status;
-
- ret = qmp_fd(fixture->fd, "{'execute': 'guest-fsfreeze-freeze'}");
- g_assert_nonnull(ret);
- qmp_assert_no_error(ret);
- QDECREF(ret);
-
- ret = qmp_fd(fixture->fd, "{'execute': 'guest-fsfreeze-status'}");
- g_assert_nonnull(ret);
- qmp_assert_no_error(ret);
- status = qdict_get_try_str(ret, "return");
- g_assert_cmpstr(status, ==, "frozen");
- QDECREF(ret);
-
- ret = qmp_fd(fixture->fd, "{'execute': 'guest-fsfreeze-thaw'}");
- g_assert_nonnull(ret);
- qmp_assert_no_error(ret);
- QDECREF(ret);
-}
-
static void test_qga_guest_exec(gconstpointer fix)
{
const TestFixture *fixture = fix;
@@ -1029,13 +946,6 @@ int main(int argc, char **argv)
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,
- test_qga_fsfreeze_and_thaw);
- g_test_add_data_func("/qga/set-time", &fix, test_qga_set_time);
- g_test_add_data_func("/qga/fstrim", &fix, test_qga_fstrim);
- }
-
ret = g_test_run();
fixture_tear_down(&fix, NULL);
--
1.8.3.1
next prev parent reply other threads:[~2017-09-15 8:03 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-09-15 8:02 [Qemu-devel] [PULL 0/9] Fixes and improvements for various qtests Thomas Huth
2017-09-15 8:02 ` [Qemu-devel] [PULL 1/9] tests: Introduce generic device hot-plug/hot-unplug functions Thomas Huth
2017-09-15 8:02 ` [Qemu-devel] [PULL 2/9] tests/test-hmp: Remove puv3 and tricore_testboard from the blacklist Thomas Huth
2017-09-15 8:02 ` [Qemu-devel] [PULL 3/9] tests/libqtest: Use a proper error message if QTEST_QEMU_BINARY is missing Thomas Huth
2017-09-15 8:02 ` [Qemu-devel] [PULL 4/9] tests: Fix broken ivshmem-server-msi/-irq tests Thomas Huth
2017-09-15 8:02 ` Thomas Huth [this message]
2017-09-15 8:02 ` [Qemu-devel] [PULL 6/9] qtest: Don't perform side effects inside assertion Thomas Huth
2017-09-15 8:02 ` [Qemu-devel] [PULL 7/9] numa-test: Use hmp() Thomas Huth
2017-09-15 8:02 ` [Qemu-devel] [PULL 8/9] libqtest: Remove dead qtest_instances variable Thomas Huth
2017-09-15 8:02 ` [Qemu-devel] [PULL 9/9] qtest: Avoid passing raw strings through hmp() Thomas Huth
2017-09-15 21:32 ` [Qemu-devel] [PULL 0/9] Fixes and improvements for various qtests Peter Maydell
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=1505462549-27298-6-git-send-email-thuth@redhat.com \
--to=thuth@redhat.com \
--cc=dgilbert@redhat.com \
--cc=eblake@redhat.com \
--cc=f4bug@amsat.org \
--cc=jsnow@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=peterx@redhat.com \
--cc=qemu-devel@nongnu.org \
/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).