[Nagiosplug-checkins] nagiosplug/plugins/tests test_disk.c, NONE, 1.1 test_disk.t, NONE, 1.1 Makefile.am, 1.5, 1.6

Ton Voon tonvoon at users.sourceforge.net
Wed Jul 12 14:15:44 CEST 2006


Update of /cvsroot/nagiosplug/nagiosplug/plugins/tests
In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv29569/tests

Modified Files:
	Makefile.am 
Added Files:
	test_disk.c test_disk.t 
Log Message:
Moving check_disk functions into utils_disk.c and testing them


--- NEW FILE: test_disk.c ---
/******************************************************************************

 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2 of the License, or
 (at your option) any later version.

 This program is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.

 You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.

 $Id: test_disk.c,v 1.1 2006/07/12 12:15:42 tonvoon Exp $
 
******************************************************************************/

#include "common.h"
#include "utils_disk.h"
#include "tap.h"

int
main (int argc, char **argv)
{
	struct name_list *exclude_filesystem=NULL;
	struct name_list *exclude_fstype=NULL;

	plan_tests(8);

	ok( np_find_name(exclude_filesystem, "/var") == FALSE, "/var not in list");
	np_add_name(&exclude_filesystem, "/var");
	ok( np_find_name(exclude_filesystem, "/var") == TRUE, "is in list now");
	ok( np_find_name(exclude_filesystem, "/home") == FALSE, "/home not in list");
	np_add_name(&exclude_filesystem, "/home");
	ok( np_find_name(exclude_filesystem, "/home") == TRUE, "is in list now");
	ok( np_find_name(exclude_filesystem, "/var") == TRUE, "/var still in list");

	ok( np_find_name(exclude_fstype, "iso9660") == FALSE, "iso9660 not in list");
	np_add_name(&exclude_fstype, "iso9660");
	ok( np_find_name(exclude_fstype, "iso9660") == TRUE, "is in list now");

	ok( np_find_name(exclude_filesystem, "iso9660") == FALSE, "Make sure no clashing in variables");


	
	
	/*
	range = parse_range_string("6");
	ok( range != NULL, "'6' is valid range");
	ok( range->start == 0, "Start correct");
	ok( range->start_infinity == FALSE, "Not using negative infinity");
	ok( range->end == 6, "End correct");
	ok( range->end_infinity == FALSE, "Not using infinity");
	free(range);

	range = parse_range_string("-7:23");
	ok( range != NULL, "'-7:23' is valid range");
	ok( range->start == -7, "Start correct");
	ok( range->start_infinity == FALSE, "Not using negative infinity");
	ok( range->end == 23, "End correct");
	ok( range->end_infinity == FALSE, "Not using infinity");
	free(range);

	range = parse_range_string(":5.75");
	ok( range != NULL, "':5.75' is valid range");
	ok( range->start == 0, "Start correct");
	ok( range->start_infinity == FALSE, "Not using negative infinity");
	ok( range->end == 5.75, "End correct");
	ok( range->end_infinity == FALSE, "Not using infinity");
	free(range);

	range = parse_range_string("~:-95.99");
	ok( range != NULL, "~:-95.99' is valid range");
	ok( range->start_infinity == TRUE, "Using negative infinity");
	ok( range->end == -95.99, "End correct (with rounding errors)");
	ok( range->end_infinity == FALSE, "Not using infinity");
	free(range);
	*/

	return exit_status();
}


Index: Makefile.am
===================================================================
RCS file: /cvsroot/nagiosplug/nagiosplug/plugins/tests/Makefile.am,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- Makefile.am	21 Mar 2006 11:42:59 -0000	1.5
+++ Makefile.am	12 Jul 2006 12:15:42 -0000	1.6
@@ -7,9 +7,9 @@
 
 INCLUDES = -I$(top_srcdir)/lib -I$(top_srcdir)/intl 
 
-EXTRA_PROGRAMS = test_utils
+EXTRA_PROGRAMS = test_utils test_disk
 
-EXTRA_DIST = test_utils.t
+EXTRA_DIST = test_utils.t test_disk.t
 
 LIBS = @LIBINTL@
 
@@ -18,6 +18,11 @@
 test_utils_LDFLAGS = -L/usr/local/lib -ltap
 test_utils_LDADD = ../utils.o
 
+test_disk_SOURCES = test_disk.c
+test_disk_CFLAGS = -g -I..
+test_disk_LDFLAGS = -L/usr/local/lib -ltap
+test_disk_LDADD = ../utils_disk.o
+
 test: ${noinst_PROGRAMS}
 	perl -MTest::Harness -e '$$Test::Harness::switches=""; runtests(map {$$_ .= ".t"} @ARGV)' $(EXTRA_PROGRAMS)
 

--- NEW FILE: test_disk.t ---
#!/usr/bin/perl
use Test::More;
if (! -e "./test_disk") {
	plan skip_all => "./test_disk not compiled - please install tap library to test";
}
exec "./test_disk";





More information about the Commits mailing list