提交 a8dc3ac2 编写于 作者: M Michal Privoznik

tests: Produce predictable results in nsstest

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: NMichal Privoznik <mprivozn@redhat.com>
上级 1de354cc
......@@ -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;
}
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册