From: <ag...@us...> - 2012-07-02 01:02:29
|
Revision: 1994 http://nagios.svn.sourceforge.net/nagios/?rev=1994&view=rev Author: ageric Date: 2012-07-02 01:02:19 +0000 (Mon, 02 Jul 2012) Log Message: ----------- lib/test-iobroker: Stop #include'ing iocache.c It messes up coverage reports for iocache.c, so we'd best avoid it. Signed-off-by: Andreas Ericsson <ae...@op...> Modified Paths: -------------- nagioscore/trunk/lib/test-iobroker.c Modified: nagioscore/trunk/lib/test-iobroker.c =================================================================== --- nagioscore/trunk/lib/test-iobroker.c 2012-07-02 01:01:55 UTC (rev 1993) +++ nagioscore/trunk/lib/test-iobroker.c 2012-07-02 01:02:19 UTC (rev 1994) @@ -9,7 +9,6 @@ #include <stdlib.h> #include <fcntl.h> -#include "iocache.c" #include "iobroker.c" static int fail, pass; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ag...@us...> - 2013-03-25 12:33:45
|
Revision: 2707 http://nagios.svn.sourceforge.net/nagios/?rev=2707&view=rev Author: ageric Date: 2013-03-25 12:33:38 +0000 (Mon, 25 Mar 2013) Log Message: ----------- lib/test-iobroker: Also test iobroker_is_registered() We run the test on removal and addition, which means we now test to make sure the iobroker handles internal state exactly as intended. Signed-off-by: Andreas Ericsson <ae...@op...> Modified Paths: -------------- nagioscore/trunk/lib/test-iobroker.c Modified: nagioscore/trunk/lib/test-iobroker.c =================================================================== --- nagioscore/trunk/lib/test-iobroker.c 2013-03-25 12:33:21 UTC (rev 2706) +++ nagioscore/trunk/lib/test-iobroker.c 2013-03-25 12:33:38 UTC (rev 2707) @@ -32,11 +32,13 @@ if (len < 0) { perror("read"); iobroker_close(iobs, fd); + ok_int(iobroker_is_registered(iobs, fd), 0, "Closing must deregister"); return 0; } /* zero read means we're disconnected */ if (!len) { iobroker_close(iobs, fd); + ok_int(iobroker_is_registered(iobs, fd), 0, "Closing must deregister"); return 0; } @@ -99,6 +101,7 @@ write(sock, msg[0], strlen(msg[0])); iobroker_register(iobs, sock, iobs, echo_service); + ok_int(iobroker_is_registered(iobs, sock), 1, "is_registered must be true"); return 0; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ag...@us...> - 2013-04-07 15:38:42
|
Revision: 2723 http://nagios.svn.sourceforge.net/nagios/?rev=2723&view=rev Author: ageric Date: 2013-04-07 15:38:31 +0000 (Sun, 07 Apr 2013) Log Message: ----------- lib/test-iobroker: Properly initialize addrlen for accept(2) strace gives random warnings otherwise, rightly indicating that we've done something stupid. Signed-off-by: Andreas Ericsson <ae...@op...> Modified Paths: -------------- nagioscore/trunk/lib/test-iobroker.c Modified: nagioscore/trunk/lib/test-iobroker.c =================================================================== --- nagioscore/trunk/lib/test-iobroker.c 2013-04-07 15:38:12 UTC (rev 2722) +++ nagioscore/trunk/lib/test-iobroker.c 2013-04-07 15:38:31 UTC (rev 2723) @@ -92,6 +92,7 @@ printf("Argument passing seems to fail spectacularly\n"); } + addrlen = sizeof(sain); //printf("listen_handler(%d, %d, %p) called\n", fd, events, arg); sock = accept(fd, (struct sockaddr *)&sain, &addrlen); if (sock < 0) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |