[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v3 25/28] tests: add /vhost-user/connect-fail test
From: |
marcandre . lureau |
Subject: |
[Qemu-devel] [PATCH v3 25/28] tests: add /vhost-user/connect-fail test |
Date: |
Wed, 6 Jul 2016 20:47:18 +0200 |
From: Marc-André Lureau <address@hidden>
Check early connection failure and resume.
Signed-off-by: Marc-André Lureau <address@hidden>
---
tests/vhost-user-test.c | 38 ++++++++++++++++++++++++++++++++++++++
1 file changed, 38 insertions(+)
diff --git a/tests/vhost-user-test.c b/tests/vhost-user-test.c
index a0b91ab..6595243 100644
--- a/tests/vhost-user-test.c
+++ b/tests/vhost-user-test.c
@@ -131,6 +131,7 @@ typedef struct TestServer {
CompatGCond data_cond;
int log_fd;
uint64_t rings;
+ bool test_fail;
} TestServer;
static const char *tmpfs;
@@ -221,6 +222,12 @@ static void chr_read(void *opaque, const uint8_t *buf, int
size)
uint8_t *p = (uint8_t *) &msg;
int fd;
+ if (s->test_fail) {
+ qemu_chr_disconnect(chr);
+ /* now switch to non-failure */
+ s->test_fail = false;
+ }
+
if (size != VHOST_USER_HDR_SIZE) {
g_test_message("Wrong message size received %d\n", size);
return;
@@ -685,6 +692,34 @@ static void test_reconnect(void)
g_test_trap_assert_passed();
g_free(path);
}
+
+static void test_connect_fail_subprocess(void)
+{
+ TestServer *s = test_server_new("reconnect");
+ char *cmd;
+
+ s->test_fail = true;
+ g_thread_new("connect", connect_thread, s);
+ cmd = GET_QEMU_CMDE(s, 2, ",server", "");
+ qtest_start(cmd);
+ g_free(cmd);
+
+ wait_for_fds(s);
+ wait_for_rings_started(s, 2);
+
+ qtest_end();
+ test_server_free(s);
+}
+
+static void test_connect_fail(void)
+{
+ gchar *path = g_strdup_printf("/%s/vhost-user/connect-fail/subprocess",
+ qtest_get_arch());
+ g_test_trap_subprocess(path, 0, 0);
+ g_test_trap_assert_passed();
+ g_free(path);
+}
+
#endif
int main(int argc, char **argv)
@@ -735,6 +770,9 @@ int main(int argc, char **argv)
qtest_add_func("/vhost-user/reconnect/subprocess",
test_reconnect_subprocess);
qtest_add_func("/vhost-user/reconnect", test_reconnect);
+ qtest_add_func("/vhost-user/connect-fail/subprocess",
+ test_connect_fail_subprocess);
+ qtest_add_func("/vhost-user/connect-fail", test_connect_fail);
#endif
ret = g_test_run();
--
2.9.0
- [Qemu-devel] [PATCH v3 16/28] Revert "vhost-net: do not crash if backend is not present", (continued)
- [Qemu-devel] [PATCH v3 16/28] Revert "vhost-net: do not crash if backend is not present", marcandre . lureau, 2016/07/06
- [Qemu-devel] [PATCH v3 17/28] get_vhost_net() should be != null after vhost_user_init, marcandre . lureau, 2016/07/06
- [Qemu-devel] [PATCH v3 18/28] vhost-net: success if backend has no ops->vhost_migration_done, marcandre . lureau, 2016/07/06
- [Qemu-devel] [PATCH v3 19/28] vhost: add assert() to check runtime behaviour, marcandre . lureau, 2016/07/06
- [Qemu-devel] [PATCH v3 20/28] char: add chr_wait_connected callback, marcandre . lureau, 2016/07/06
- [Qemu-devel] [PATCH v3 21/28] char: add and use tcp_chr_wait_connected, marcandre . lureau, 2016/07/06
- [Qemu-devel] [PATCH v3 22/28] vhost-user: wait until backend init is completed, marcandre . lureau, 2016/07/06
- [Qemu-devel] [PATCH v3 23/28] tests: plug some leaks in virtio-net-test, marcandre . lureau, 2016/07/06
- [Qemu-devel] [PATCH v3 25/28] tests: add /vhost-user/connect-fail test,
marcandre . lureau <=
- [Qemu-devel] [PATCH v3 24/28] tests: fix vhost-user-test leak, marcandre . lureau, 2016/07/06
- [Qemu-devel] [PATCH v3 27/28] vhost-user: add error report in vhost_user_write(), marcandre . lureau, 2016/07/06
- [Qemu-devel] [PATCH v3 26/28] tests: add a simple /vhost-user/multiqueue test, marcandre . lureau, 2016/07/06
- [Qemu-devel] [PATCH v3 28/28] vhost: add vhost_net_set_backend(), marcandre . lureau, 2016/07/06