shaba/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-22 17:34:18 +03:00
Code Releases Activity

tests: Produce predictable results in nsstest

Browse Source 
Problem is that in the test any status file matching
tests/nssdata/*.status is loaded as it contains IP addresses that
are parsed. However, there's no order specified in which the
files are loaded. Therefore on different systems the order may be
different. This is then producing an unexpected results.
Instead of defining an order in which the files are loaded, make
the code that checks for missing IP addresses (or redundant ones)
cope with unordered list of addresses. The reasoning behind is
that the code doing the parsing is used in real NSS module where
we don't care for ordering.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
This commit is contained in:
Michal Privoznik 2016-03-21 14:52:49 +01:00
parent 1de354ccc5
commit a8dc3ac28a
1 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
tests/nsstest.c
View File

@ -49,7 +49,7 @@ testGetHostByName(const void *opaque)
char buf[BUF_SIZE] = { 0 };
char **addrList;
int rv, tmp_errno = 0, tmp_herrno = 0;
size_t i = 0;
size_t i = 0, j = 0;
if (!data)
goto cleanup;
@ -141,17 +141,14 @@ testGetHostByName(const void *opaque)
goto cleanup;
}
if (!data->ipAddr[i]) {
virReportError(VIR_ERR_INTERNAL_ERROR,
"Unexpected address %s", ipAddr);
VIR_FREE(ipAddr);
goto cleanup;
for (j = 0; data->ipAddr[j]; j++) {
if (STREQ(data->ipAddr[j], ipAddr))
break;
}
if (STRNEQ(data->ipAddr[i], ipAddr)) {
if (!data->ipAddr[j]) {
virReportError(VIR_ERR_INTERNAL_ERROR,
"Address mismatch. Expected %s got %s",
data->ipAddr[i], ipAddr);
"Unexpected address %s", ipAddr);
VIR_FREE(ipAddr);
goto cleanup;
}
@ -161,10 +158,12 @@ testGetHostByName(const void *opaque)
i++;
}
if (data->ipAddr[i]) {
for (j = 0; data->ipAddr[j]; j++)
;
if (i != j) {
virReportError(VIR_ERR_INTERNAL_ERROR,
"Address mismatch. Expected %s got nothing",
data->ipAddr[i]);
"Expected %zu addresses, got %zu", j, i);
goto cleanup;
}