Skip to content

Make test_comstack pass when executed in a container #211

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
adamdickmeiss merged 2 commits into from
Sep 21, 2026
Merged

Make test_comstack pass when executed in a container #211

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4022735
Make test_comstack pass when executed in a container
adamdickmeiss Sep 21, 2026
ae392e6
Merge remote-tracking branch 'origin/master' into test-comstack-conta…
adamdickmeiss Sep 21, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 21 additions & 22 deletions test/test_comstack.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -475,7 +475,7 @@ static void tst_cs_get_host_args(void)
YAZ_CHECK(arg && !strcmp(arg, "x"));
}

static void tst_cs_get_error(void)
static void tst_cs_get_error_tcp(void)
{
COMSTACK cs = cs_create(tcpip_type, CS_FLAGS_BLOCKING, PROTO_Z3950);
const char *details = "not set";
Expand All @@ -486,30 +486,28 @@ static void tst_cs_get_error(void)

YAZ_CHECK_EQ(cs_get_error(cs, &details), CSNONE);
YAZ_CHECK(!details);
cs_close(cs);
}

static void tst_cs_get_error_ssl(void)
{
#if HAVE_GNUTLS_H
{
COMSTACK ssl_cs =
cs_create(ssl_type, CS_FLAGS_BLOCKING, PROTO_Z3950);
const char *details = NULL;
COMSTACK ssl_cs =
cs_create(ssl_type, CS_FLAGS_BLOCKING, PROTO_Z3950);

YAZ_CHECK(ssl_cs);
if (ssl_cs)
{
void *ad = cs_straddr(ssl_cs, "localhost:0");
YAZ_CHECK(ad);
YAZ_CHECK(cs_set_ssl_certificate_file(ssl_cs, ""));
if (ad)
{
YAZ_CHECK_EQ(cs_bind(ssl_cs, ad, CS_SERVER), -1);
YAZ_CHECK_EQ(cs_get_error(ssl_cs, &details), CSERRORSSL);
YAZ_CHECK(details && *details);
}
cs_close(ssl_cs);
}
}
YAZ_CHECK(ssl_cs);
if (!ssl_cs)
return;
/* Certificate loading fails before tcpip_bind uses the address
or socket. Avoid cs_straddr here: it creates a socket, which
may be prohibited in a container or test sandbox. */
YAZ_CHECK(cs_set_ssl_certificate_file(ssl_cs, ""));
YAZ_CHECK_EQ(cs_bind(ssl_cs, 0, CS_SERVER), -1);
YAZ_CHECK_EQ(cs_get_error(ssl_cs, &details), CSERRORSSL);
YAZ_CHECK(details && *details);
cs_close(ssl_cs);
#endif

cs_close(cs);
}

int main (int argc, char **argv)
Expand All @@ -521,7 +519,8 @@ int main (int argc, char **argv)
tst_http_request();
tst_http_response();
tst_cs_get_host_args();
tst_cs_get_error();
tst_cs_get_error_tcp();
tst_cs_get_error_ssl();
YAZ_CHECK_TERM;
}

Expand Down
Loading