[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 07/13] tests/test-filter: Make tests independent of g
From: |
Thomas Huth |
Subject: |
[Qemu-devel] [PULL 07/13] tests/test-filter: Make tests independent of global_qtest |
Date: |
Mon, 17 Dec 2018 17:21:24 +0100 |
Apart from using qmp() in the qmp_discard_response() macro, these
tests do not have any dependencies to the global_qtest variable,
so we can simply get rid of it here by replacing the qmp() with
qtest_qmp() in the macro.
Reviewed-by: Eric Blake <address@hidden>
Signed-off-by: Thomas Huth <address@hidden>
---
tests/test-filter-mirror.c | 9 +++++----
tests/test-filter-redirector.c | 16 +++++++++-------
2 files changed, 14 insertions(+), 11 deletions(-)
diff --git a/tests/test-filter-mirror.c b/tests/test-filter-mirror.c
index d15917e..7ab2aed 100644
--- a/tests/test-filter-mirror.c
+++ b/tests/test-filter-mirror.c
@@ -17,7 +17,7 @@
#include "qemu/main-loop.h"
/* TODO actually test the results and get rid of this */
-#define qmp_discard_response(...) qobject_unref(qmp(__VA_ARGS__))
+#define qmp_discard_response(qs, ...) qobject_unref(qtest_qmp(qs, __VA_ARGS__))
static void test_mirror(void)
{
@@ -29,6 +29,7 @@ static void test_mirror(void)
uint32_t size = sizeof(send_buf);
size = htonl(size);
const char *devstr = "e1000";
+ QTestState *qts;
if (g_str_equal(qtest_get_arch(), "s390x")) {
devstr = "virtio-net-ccw";
@@ -40,7 +41,7 @@ static void test_mirror(void)
ret = mkstemp(sock_path);
g_assert_cmpint(ret, !=, -1);
- global_qtest = qtest_initf(
+ qts = qtest_initf(
"-netdev socket,id=qtest-bn0,fd=%d "
"-device %s,netdev=qtest-bn0,id=qtest-e0 "
"-chardev socket,id=mirror0,path=%s,server,nowait "
@@ -61,7 +62,7 @@ static void test_mirror(void)
};
/* send a qmp command to guarantee that 'connected' is setting to true. */
- qmp_discard_response("{ 'execute' : 'query-status'}");
+ qmp_discard_response(qts, "{ 'execute' : 'query-status'}");
ret = iov_send(send_sock[0], iov, 2, 0, sizeof(size) + sizeof(send_buf));
g_assert_cmpint(ret, ==, sizeof(send_buf) + sizeof(size));
close(send_sock[0]);
@@ -78,6 +79,7 @@ static void test_mirror(void)
g_free(recv_buf);
close(recv_sock);
unlink(sock_path);
+ qtest_quit(qts);
}
int main(int argc, char **argv)
@@ -88,7 +90,6 @@ int main(int argc, char **argv)
qtest_add_func("/netfilter/mirror", test_mirror);
ret = g_test_run();
- qtest_end();
return ret;
}
diff --git a/tests/test-filter-redirector.c b/tests/test-filter-redirector.c
index 615ff5c..9ca9fea 100644
--- a/tests/test-filter-redirector.c
+++ b/tests/test-filter-redirector.c
@@ -59,7 +59,7 @@
#include "qemu/main-loop.h"
/* TODO actually test the results and get rid of this */
-#define qmp_discard_response(...) qobject_unref(qmp(__VA_ARGS__))
+#define qmp_discard_response(qs, ...) qobject_unref(qtest_qmp(qs, __VA_ARGS__))
static const char *get_devstr(void)
{
@@ -81,6 +81,7 @@ static void test_redirector_tx(void)
char *recv_buf;
uint32_t size = sizeof(send_buf);
size = htonl(size);
+ QTestState *qts;
ret = socketpair(PF_UNIX, SOCK_STREAM, 0, backend_sock);
g_assert_cmpint(ret, !=, -1);
@@ -90,7 +91,7 @@ static void test_redirector_tx(void)
ret = mkstemp(sock_path1);
g_assert_cmpint(ret, !=, -1);
- global_qtest = qtest_initf(
+ qts = qtest_initf(
"-netdev socket,id=qtest-bn0,fd=%d "
"-device %s,netdev=qtest-bn0,id=qtest-e0 "
"-chardev socket,id=redirector0,path=%s,server,nowait "
@@ -108,7 +109,7 @@ static void test_redirector_tx(void)
g_assert_cmpint(recv_sock, !=, -1);
/* send a qmp command to guarantee that 'connected' is setting to true. */
- qmp_discard_response("{ 'execute' : 'query-status'}");
+ qmp_discard_response(qts, "{ 'execute' : 'query-status'}");
struct iovec iov[] = {
{
@@ -137,7 +138,7 @@ static void test_redirector_tx(void)
close(recv_sock);
unlink(sock_path0);
unlink(sock_path1);
- qtest_end();
+ qtest_quit(qts);
}
static void test_redirector_rx(void)
@@ -150,6 +151,7 @@ static void test_redirector_rx(void)
char *recv_buf;
uint32_t size = sizeof(send_buf);
size = htonl(size);
+ QTestState *qts;
ret = socketpair(PF_UNIX, SOCK_STREAM, 0, backend_sock);
g_assert_cmpint(ret, !=, -1);
@@ -159,7 +161,7 @@ static void test_redirector_rx(void)
ret = mkstemp(sock_path1);
g_assert_cmpint(ret, !=, -1);
- global_qtest = qtest_initf(
+ qts = qtest_initf(
"-netdev socket,id=qtest-bn0,fd=%d "
"-device %s,netdev=qtest-bn0,id=qtest-e0 "
"-chardev socket,id=redirector0,path=%s,server,nowait "
@@ -186,7 +188,7 @@ static void test_redirector_rx(void)
send_sock = unix_connect(sock_path1, NULL);
g_assert_cmpint(send_sock, !=, -1);
/* send a qmp command to guarantee that 'connected' is setting to true. */
- qmp_discard_response("{ 'execute' : 'query-status'}");
+ qmp_discard_response(qts, "{ 'execute' : 'query-status'}");
ret = iov_send(send_sock, iov, 2, 0, sizeof(size) + sizeof(send_buf));
g_assert_cmpint(ret, ==, sizeof(send_buf) + sizeof(size));
@@ -204,7 +206,7 @@ static void test_redirector_rx(void)
g_free(recv_buf);
unlink(sock_path0);
unlink(sock_path1);
- qtest_end();
+ qtest_quit(qts);
}
int main(int argc, char **argv)
--
1.8.3.1
- [Qemu-devel] [PULL 00/13] qtest patches, Thomas Huth, 2018/12/17
- [Qemu-devel] [PULL 01/13] tests/libqos/pci: Make PCI access functions independent of global_qtest, Thomas Huth, 2018/12/17
- [Qemu-devel] [PULL 02/13] ivshmem-test: Drop dependence on global_qtest, Thomas Huth, 2018/12/17
- [Qemu-devel] [PULL 04/13] tests/vmgenid: Make test independent of global_qtest, Thomas Huth, 2018/12/17
- [Qemu-devel] [PULL 03/13] tests/acpi-utils: Drop dependence on global_qtest, Thomas Huth, 2018/12/17
- [Qemu-devel] [PULL 05/13] tests/pvpanic: Make the pvpanic test independent of global_qtest, Thomas Huth, 2018/12/17
- [Qemu-devel] [PULL 06/13] tests/boot-serial: Get rid of global_qtest variable, Thomas Huth, 2018/12/17
- [Qemu-devel] [PULL 08/13] tests/machine-none: Make test independent of global_qtest, Thomas Huth, 2018/12/17
- [Qemu-devel] [PULL 09/13] tests/prom-env: Make test independent of global_qtest, Thomas Huth, 2018/12/17
- [Qemu-devel] [PULL 07/13] tests/test-filter: Make tests independent of global_qtest,
Thomas Huth <=
- [Qemu-devel] [PULL 10/13] tests/pxe: Make test independent of global_qtest, Thomas Huth, 2018/12/17
- [Qemu-devel] [PULL 12/13] tests: acpi: remove not used ACPI_READ_GENERIC_ADDRESS macro, Thomas Huth, 2018/12/17
- [Qemu-devel] [PULL 11/13] tests: Exit boot-serial-test loop if child dies, Thomas Huth, 2018/12/17
- [Qemu-devel] [PULL 13/13] tests/bios-tables-test: Sanitize test verbose output, Thomas Huth, 2018/12/17
- Re: [Qemu-devel] [PULL 00/13] qtest patches, Peter Maydell, 2018/12/18