ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert "netdev: set timeout depending on loadavg" 

This reverts commit cadfc72939.

The test was not timing out because of slow execution. It was
timing out due to a race condition leading to the client QEMU
attempting (and fatally failing) to connect before the server
QEMU was listening.

Signed-off-by: "Daniel P. Berrangé" <berrange@redhat.com>
Message-ID: <20240104162942.211458-2-berrange@redhat.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
This commit is contained in:
Daniel P. Berrangé 2024-01-04 16:29:37 +00:00 committed by Thomas Huth
parent b01932889d
commit 9f7ac8e869
1 changed files with 1 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
tests/qtest/netdev-socket.c
View File

@ -18,32 +18,6 @@
#define CONNECTION_TIMEOUT 120
static double connection_timeout(void)
{
double load;
int ret = getloadavg(&load, 1);
/*
* If we can't get load data, or load is low because we just started
* running, assume load of 1 (we are alone in this system).
*/
if (ret < 1 || load < 1.0) {
load = 1.0;
}
/*
* No one wants to wait more than 10 minutes for this test. Higher load?
* Too bad.
*/
if (load > 10.0) {
fprintf(stderr, "Warning: load %f higher than 10 - test might timeout\n",
load);
load = 10.0;
}
/* if load is high increase timeout as we might not get a chance to run */
return load * CONNECTION_TIMEOUT;
}
#define EXPECT_STATE(q, e, t) \
do { \
char *resp = NULL; \
@ -57,7 +31,7 @@ do { \
if (g_str_equal(resp, e)) { \
break; \
} \
} while (g_test_timer_elapsed() < connection_timeout()); \
} while (g_test_timer_elapsed() < CONNECTION_TIMEOUT); \
g_assert_cmpstr(resp, ==, e); \
g_free(resp); \
} while (0)