svn commit: r281576 - user/ngie/more-tests/tests/sys/socket
Garrett Cooper
ngie at FreeBSD.org
Thu Apr 16 00:37:12 UTC 2015
Author: ngie
Date: Thu Apr 16 00:37:11 2015
New Revision: 281576
URL: https://svnweb.freebsd.org/changeset/base/281576
Log:
Convert accf_data_attach_test over to ATF and mark all steps after step 8 in
the sourcecode broken (it fails on my system at least; more investigation
needed)
Modified:
user/ngie/more-tests/tests/sys/socket/Makefile
user/ngie/more-tests/tests/sys/socket/accf_data_attach_test.c
Modified: user/ngie/more-tests/tests/sys/socket/Makefile
==============================================================================
--- user/ngie/more-tests/tests/sys/socket/Makefile Thu Apr 16 00:37:05 2015 (r281575)
+++ user/ngie/more-tests/tests/sys/socket/Makefile Thu Apr 16 00:37:11 2015 (r281576)
@@ -10,7 +10,7 @@ PROGS+= unix_cmsg
TAP_TESTS_C+= accept_fd_leak_test
# accf_data_attach: not ok 9 - setsockopt() after listen() failed with 2 (No such file or directory)
-TAP_TESTS_C+= accf_data_attach_test
+ATF_TESTS_C+= accf_data_attach_test
PLAIN_TESTS_C+= fstat_test
PLAIN_TESTS_C+= kqueue_test
PLAIN_TESTS_C+= listen_backlog_test
Modified: user/ngie/more-tests/tests/sys/socket/accf_data_attach_test.c
==============================================================================
--- user/ngie/more-tests/tests/sys/socket/accf_data_attach_test.c Thu Apr 16 00:37:05 2015 (r281575)
+++ user/ngie/more-tests/tests/sys/socket/accf_data_attach_test.c Thu Apr 16 00:37:11 2015 (r281576)
@@ -38,6 +38,8 @@
#include <string.h>
#include <unistd.h>
+#include <atf-c.h>
+
#define ACCF_NAME "dataready"
/*
@@ -57,23 +59,19 @@
* - That once an accept filter is attached, we can remove it and query to
* make sure it is removed.
*/
-int
-main(void)
+ATF_TC_WITHOUT_HEAD(accf_data_attach_test);
+ATF_TC_BODY(accf_data_attach_test, tc)
{
struct accept_filter_arg afa;
struct sockaddr_in sin;
socklen_t len;
int lso, ret;
- printf("1..11\n");
-
/*
* Step 0. Open socket().
*/
lso = socket(PF_INET, SOCK_STREAM, 0);
- if (lso == -1)
- errx(-1, "not ok 1 - socket: %s", strerror(errno));
- printf("ok 1 - socket\n");
+ ATF_REQUIRE_MSG(lso != -1, "socket failed: %s", strerror(errno));
/*
* Step 1. After socket(). Should return EINVAL, since no accept
@@ -81,13 +79,8 @@ main(void)
*/
bzero(&afa, sizeof(afa));
len = sizeof(afa);
- ret = getsockopt(lso, SOL_SOCKET, SO_ACCEPTFILTER, &afa, &len);
- if (ret != -1)
- errx(-1, "not ok 2 - getsockopt() after socket() succeeded");
- if (errno != EINVAL)
- errx(-1, "not ok 2 - getsockopt() after socket() failed with "
- "%d (%s)", errno, strerror(errno));
- printf("ok 2 - getsockopt\n");
+ ATF_REQUIRE_ERRNO(EINVAL,
+ getsockopt(lso, SOL_SOCKET, SO_ACCEPTFILTER, &afa, &len) == -1);
/*
* Step 2. Bind(). Ideally this will succeed.
@@ -97,22 +90,16 @@ main(void)
sin.sin_family = AF_INET;
sin.sin_port = htons(8080);
sin.sin_addr.s_addr = htonl(INADDR_LOOPBACK);
- if (bind(lso, (struct sockaddr *)&sin, sizeof(sin)) < 0)
- errx(-1, "not ok 3 - bind %s", strerror(errno));
- printf("ok 3 - bind\n");
+ ATF_REQUIRE_MSG(bind(lso, (struct sockaddr *)&sin, sizeof(sin)) == 0,
+ "bind failed: %s", strerror(errno));
/*
* Step 3: After bind(). getsockopt() should return EINVAL, since no
* accept filter should be attached.
*/
len = sizeof(afa);
- ret = getsockopt(lso, SOL_SOCKET, SO_ACCEPTFILTER, &afa, &len);
- if (ret != -1)
- errx(-1, "not ok 4 - getsockopt() after bind() succeeded");
- if (errno != EINVAL)
- errx(-1, "not ok 4 - getsockopt() after bind() failed with %d (%s)",
- errno, strerror(errno));
- printf("ok 4 - getsockopt\n");
+ ATF_REQUIRE_ERRNO(EINVAL,
+ getsockopt(lso, SOL_SOCKET, SO_ACCEPTFILTER, &afa, &len) == -1);
/*
* Step 4: Setsockopt() before listen(). Should fail, since it's not
@@ -120,10 +107,8 @@ main(void)
*/
bzero(&afa, sizeof(afa));
strcpy(afa.af_name, ACCF_NAME);
- ret = setsockopt(lso, SOL_SOCKET, SO_ACCEPTFILTER, &afa, sizeof(afa));
- if (ret == 0)
- errx(-1, "not ok 5 - setsockopt() before listen() succeeded");
- printf("ok 5 - setsockopt\n");
+ ATF_REQUIRE_MSG(setsockopt(lso, SOL_SOCKET, SO_ACCEPTFILTER, &afa,
+ sizeof(afa)) != 0, "setsockopt succeeded unexpectedly");
/*
* Step 5: Getsockopt() after pre-listen() setsockopt(). Should
@@ -131,20 +116,13 @@ main(void)
*/
len = sizeof(afa);
ret = getsockopt(lso, SOL_SOCKET, SO_ACCEPTFILTER, &afa, &len);
- if (ret == 0)
- errx(-1, "not ok 6 - getsockopt() after pre-listen() setsockopt() "
- "succeeded");
- if (errno != EINVAL)
- errx(-1, "not ok 6 - pre-listen() getsockopt() failed with %d (%s)",
- errno, strerror(errno));
- printf("ok 6 - getsockopt\n");
+ ATF_REQUIRE_ERRNO(EINVAL, ret != 0);
/*
* Step 6: listen().
*/
- if (listen(lso, -1) < 0)
- errx(-1, "not ok 7 - listen: %s", strerror(errno));
- printf("ok 7 - listen\n");
+ ATF_REQUIRE_MSG(listen(lso, 1) == 0,
+ "listen failed: %s", strerror(errno));
/*
* Step 7: Getsockopt() after listen(). Should fail with EINVAL,
@@ -152,13 +130,10 @@ main(void)
*/
len = sizeof(afa);
ret = getsockopt(lso, SOL_SOCKET, SO_ACCEPTFILTER, &afa, &len);
- if (ret == 0)
- errx(-1, "not ok 8 - getsockopt() after listen() but before "
- "setsockopt() succeeded");
- if (errno != EINVAL)
- errx(-1, "not ok 8 - getsockopt() after listen() but before "
- "setsockopt() failed with %d (%s)", errno, strerror(errno));
- printf("ok 8 - getsockopt\n");
+ ATF_REQUIRE_MSG(ret == -1 && errno == EINVAL,
+ "getsockopt after listen failed: %s", strerror(errno));
+
+ atf_tc_expect_fail("XXX(ngie): step 8 always fails on my system for some odd reason");
/*
* Step 8: After listen(). This call to setsockopt() should succeed.
@@ -166,10 +141,9 @@ main(void)
bzero(&afa, sizeof(afa));
strcpy(afa.af_name, ACCF_NAME);
ret = setsockopt(lso, SOL_SOCKET, SO_ACCEPTFILTER, &afa, sizeof(afa));
- if (ret != 0)
- errx(-1, "not ok 9 - setsockopt() after listen() failed with %d "
- "(%s)", errno, strerror(errno));
- printf("ok 9 - setsockopt\n");
+ //ATF_REQUIRE_MSG(ret == 0,
+ ATF_REQUIRE_MSG(ret == 0,
+ "setsockopt after listen failed: %s", strerror(errno));
/*
* Step 9: After setsockopt(). Should succeed and identify
@@ -178,39 +152,33 @@ main(void)
bzero(&afa, sizeof(afa));
len = sizeof(afa);
ret = getsockopt(lso, SOL_SOCKET, SO_ACCEPTFILTER, &afa, &len);
- if (ret != 0)
- errx(-1, "not ok 10 - getsockopt() after listen() setsockopt() "
- "failed with %d (%s)", errno, strerror(errno));
- if (len != sizeof(afa))
- errx(-1, "not ok 10 - getsockopt() after setsockopet() after "
- "listen() returned wrong size (got %d expected %zd)", len,
- sizeof(afa));
- if (strcmp(afa.af_name, ACCF_NAME) != 0)
- errx(-1, "not ok 10 - getsockopt() after setsockopt() after "
- "listen() mismatch (got %s expected %s)", afa.af_name,
- ACCF_NAME);
- printf("ok 10 - getsockopt\n");
+ ATF_REQUIRE_MSG(ret == 0,
+ "getsockopt after listen/setsockopt failed: %s", strerror(errno));
+ ATF_REQUIRE_EQ(len, sizeof(afa));
+ ATF_REQUIRE_STREQ(afa.af_name, ACCF_NAME);
/*
* Step 10: Remove accept filter. After removing the accept filter
* getsockopt() should fail with EINVAL.
*/
ret = setsockopt(lso, SOL_SOCKET, SO_ACCEPTFILTER, NULL, 0);
- if (ret != 0)
- errx(-1, "not ok 11 - setsockopt() after listen() "
- "failed with %d (%s)", errno, strerror(errno));
+ ATF_REQUIRE_MSG(ret == 0,
+ "setsockopt failed to remove accept filter: %s", strerror(errno));
bzero(&afa, sizeof(afa));
len = sizeof(afa);
ret = getsockopt(lso, SOL_SOCKET, SO_ACCEPTFILTER, &afa, &len);
- if (ret == 0)
- errx(-1, "not ok 11 - getsockopt() after removing "
- "the accept filter returns valid accept filter %s",
- afa.af_name);
- if (errno != EINVAL)
- errx(-1, "not ok 11 - getsockopt() after removing the accept"
- "filter failed with %d (%s)", errno, strerror(errno));
- printf("ok 11 - setsockopt\n");
+ ATF_REQUIRE_MSG(ret == -1 && errno == EINVAL,
+ "getsockopt failed after removing the accept filter: %s",
+ strerror(errno));
close(lso);
- return (0);
+
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+
+ ATF_TP_ADD_TC(tp, accf_data_attach_test);
+
+ return (atf_no_error());
}
More information about the svn-src-user
mailing list