NuKVM/libvirt
3
0
Fork 0
mirror of https://github.com/libvirt/libvirt.git synced 2025-02-25 18:55:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

tests: virnetdaemontest: Enable testing for no-keepalive-required

Browse Source 
Commit a8743c39 removed keepalive_required attribute from daemon, added a test
case for it, but forgot to enable the test itself in virnetdaemontest.

Signed-off-by: Erik Skultety <eskultet@redhat.com>
This commit is contained in:
Erik Skultety 2016-04-13 21:06:00 +02:00
parent 8da7520d22
commit ac55654e35
2 changed files with 109 additions and 108 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

216
tests/virnetdaemondata/output-data-no-keepalive-required.json
View File

@ -1,126 +1,126 @@
{ {
"servers": { "servers": {
"testServer0": { "testServer0": {
"min_workers": 10, "min_workers": 10,
"max_workers": 50, "max_workers": 50,
"priority_workers": 5, "priority_workers": 5,
"max_clients": 100, "max_clients": 100,
"max_anonymous_clients": 100,
"keepaliveInterval": 120, "keepaliveInterval": 120,
"keepaliveCount": 5, "keepaliveCount": 5,
"services": [ "services": [
{ {
"auth": 0, "auth": 0,
"readonly": true, "readonly": true,
"nrequests_client_max": 2, "nrequests_client_max": 2,
"socks": [ "socks": [
{ {
"fd": 100, "fd": 100,
"errfd": -1, "errfd": -1,
"pid": 0, "pid": 0,
"isClient": false "isClient": false
} }
] ]
}, },
{ {
"auth": 2, "auth": 2,
"readonly": false, "readonly": false,
"nrequests_client_max": 5, "nrequests_client_max": 5,
"socks": [ "socks": [
{ {
"fd": 101, "fd": 101,
"errfd": -1, "errfd": -1,
"pid": 0, "pid": 0,
"isClient": false "isClient": false
} }
] ]
} }
], ],
"clients": [ "clients": [
{ {
"auth": 1, "auth": 1,
"readonly": true, "readonly": true,
"nrequests_max": 15, "nrequests_max": 15,
"sock": { "sock": {
"fd": 102, "fd": 102,
"errfd": -1, "errfd": -1,
"pid": -1, "pid": -1,
"isClient": true "isClient": true
} }
},
{
"auth": 2,
"readonly": true,
"nrequests_max": 66,
"sock": {
"fd": 103,
"errfd": -1,
"pid": -1,
"isClient": true
}
}
]
}, },
{ "testServer1": {
"auth": 2, "min_workers": 2,
"readonly": true, "max_workers": 50,
"nrequests_max": 66, "priority_workers": 5,
"sock": { "max_clients": 100,
"fd": 103, "max_anonymous_clients": 100,
"errfd": -1, "keepaliveInterval": 120,
"pid": -1, "keepaliveCount": 5,
"isClient": true "services": [
}
}
]
},
"testServer1": {
{
"min_workers": 2,
"max_workers": 50,
"priority_workers": 5,
"max_clients": 100,
"keepaliveInterval": 120,
"keepaliveCount": 5,
"services": [
{
"auth": 0,
"readonly": true,
"nrequests_client_max": 2,
"socks": [
{ {
"fd": 100, "auth": 0,
"errfd": -1, "readonly": true,
"pid": 0, "nrequests_client_max": 2,
"isClient": false "socks": [
{
"fd": 100,
"errfd": -1,
"pid": 0,
"isClient": false
}
]
},
{
"auth": 2,
"readonly": false,
"nrequests_client_max": 5,
"socks": [
{
"fd": 101,
"errfd": -1,
"pid": 0,
"isClient": false
}
]
}
],
"clients": [
{
"auth": 1,
"readonly": true,
"nrequests_max": 15,
"sock": {
"fd": 102,
"errfd": -1,
"pid": -1,
"isClient": true
}
},
{
"auth": 2,
"readonly": true,
"nrequests_max": 66,
"sock": {
"fd": 103,
"errfd": -1,
"pid": -1,
"isClient": true
}
} }
] ]
},
{
"auth": 2,
"readonly": false,
"nrequests_client_max": 5,
"socks": [
{
"fd": 101,
"errfd": -1,
"pid": 0,
"isClient": false
}
]
}
],
"clients": [
{
"auth": 1,
"readonly": true,
"nrequests_max": 15,
"sock": {
"fd": 102,
"errfd": -1,
"pid": -1,
"isClient": true
}
},
{
"auth": 2,
"readonly": true,
"nrequests_max": 66,
"sock": {
"fd": 103,
"errfd": -1,
"pid": -1,
"isClient": true
}
}
]
} }
} }
}
} }

1
tests/virnetdaemontest.c
View File

@ -335,6 +335,7 @@ mymain(void)
EXEC_RESTART_TEST("anon-clients", 1); EXEC_RESTART_TEST("anon-clients", 1);
EXEC_RESTART_TEST("admin-nomdns", 2); EXEC_RESTART_TEST("admin-nomdns", 2);
EXEC_RESTART_TEST("admin-server-names", 2); EXEC_RESTART_TEST("admin-server-names", 2);
EXEC_RESTART_TEST("no-keepalive-required", 2);
EXEC_RESTART_TEST_FAIL("anon-clients", 2); EXEC_RESTART_TEST_FAIL("anon-clients", 2);
return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE; return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE;