summaryrefslogtreecommitdiffstats
path: root/lib/tests
diff options
context:
space:
mode:
authorThomas Guyot-Sionnest <dermoth@users.sourceforge.net>2008-11-04 21:52:45 (GMT)
committerThomas Guyot-Sionnest <dermoth@users.sourceforge.net>2008-11-04 21:52:45 (GMT)
commitcca36dc2457a0e3abd071c48fcbf7e87f681706c (patch)
tree5c1d263a8e9e2beb74dbe72e1867e6b0db968d70 /lib/tests
parent83ec9f269438af01e9325528233256c1a5886b00 (diff)
downloadmonitoring-plugins-cca36dc2457a0e3abd071c48fcbf7e87f681706c.tar.gz
Fixed the test (not the bug yet) and added similar one to test_ini (that one works)
git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@2066 f882894a-f735-0410-b71e-b25c423dba1c
Diffstat (limited to 'lib/tests')
-rw-r--r--lib/tests/test_ini.c6
-rw-r--r--lib/tests/test_opts.c19
2 files changed, 13 insertions, 12 deletions
diff --git a/lib/tests/test_ini.c b/lib/tests/test_ini.c
index 1ab1e5d..76a948b 100644
--- a/lib/tests/test_ini.c
+++ b/lib/tests/test_ini.c
@@ -55,7 +55,7 @@ main (int argc, char **argv)
55{ 55{
56 char *optstr=NULL; 56 char *optstr=NULL;
57 57
58 plan_tests(11); 58 plan_tests(12);
59 59
60 optstr=list2str(np_get_defaults("section@./config-tiny.ini", "check_disk")); 60 optstr=list2str(np_get_defaults("section@./config-tiny.ini", "check_disk"));
61 ok( !strcmp(optstr, "--one=two --Foo=Bar --this=Your Mother! --blank"), "config-tiny.ini's section as expected"); 61 ok( !strcmp(optstr, "--one=two --Foo=Bar --this=Your Mother! --blank"), "config-tiny.ini's section as expected");
@@ -109,6 +109,10 @@ main (int argc, char **argv)
109 ok( !strcmp(optstr, "--foo=bar --bar=foo"), "plugin.ini's section_twice defined twice in the file"); 109 ok( !strcmp(optstr, "--foo=bar --bar=foo"), "plugin.ini's section_twice defined twice in the file");
110 my_free(optstr); 110 my_free(optstr);
111 111
112 optstr=list2str(np_get_defaults("tcp_long_lines@plugins.ini", "check_tcp"));
113 ok( !strcmp(optstr, "--escape --send=Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda --expect=Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda --jail"), "Long options");
114 my_free(optstr);
115
112 return exit_status(); 116 return exit_status();
113} 117}
114 118
diff --git a/lib/tests/test_opts.c b/lib/tests/test_opts.c
index b2c93eb..b9696df 100644
--- a/lib/tests/test_opts.c
+++ b/lib/tests/test_opts.c
@@ -279,19 +279,16 @@ main (int argc, char **argv)
279 argv_test[2] = "--extra-opts=tcp_long_lines@plugins.ini"; 279 argv_test[2] = "--extra-opts=tcp_long_lines@plugins.ini";
280 argv_test[3] = NULL; 280 argv_test[3] = NULL;
281 argc_test=3; 281 argc_test=3;
282 argv_known=(char **)realloc(argv_known, 10*sizeof(char **)); 282 argv_known=(char **)realloc(argv_known, 7*sizeof(char **));
283 argv_known[0] = "check_tcp"; 283 argv_known[0] = "check_tcp";
284 argv_known[1] = "--timeout"; 284 argv_known[1] = "--timeout=10";
285 argv_known[2] = "10"; 285 argv_known[2] = "--escape";
286 argv_known[3] = "--escape"; 286 argv_known[3] = "--send=Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda";
287 argv_known[4] = "--send"; 287 argv_known[4] = "--expect=Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda";
288 argv_known[5] = "Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda"; 288 argv_known[5] = "--jail";
289 argv_known[6] = "--expect"; 289 argv_known[6] = NULL;
290 argv_known[7] = "Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda";
291 argv_known[8] = "--jail";
292 argv_known[9] = NULL;
293 argv_test=np_extra_opts(&argc_test, argv_test, "check_tcp"); 290 argv_test=np_extra_opts(&argc_test, argv_test, "check_tcp");
294 ok(array_diff(argc_test, argv_test, 9, argv_known), "Long lines test"); 291 ok(array_diff(argc_test, argv_test, 6, argv_known), "Long lines test");
295 my_free(&argc_test,argv_test); 292 my_free(&argc_test,argv_test);
296 293
297 return exit_status(); 294 return exit_status();