diff options
Diffstat (limited to 'lib/tests')
| -rw-r--r-- | lib/tests/test_ini.c | 26 |
1 files changed, 9 insertions, 17 deletions
diff --git a/lib/tests/test_ini.c b/lib/tests/test_ini.c index b02d1452..de9f8adf 100644 --- a/lib/tests/test_ini.c +++ b/lib/tests/test_ini.c @@ -36,12 +36,13 @@ list2str(np_arg_list *optlst) char *optstr=NULL; /* Put everything as a space-separated string */ + asprintf(&optstr, ""); while (optlst) { - asprintf(&optstr, "%s%s ", optstr?optstr:"", optlst->arg); + asprintf(&optstr, "%s%s ", optstr, optlst->arg); optlst=optlst->next; } /* Strip last whitespace */ - optstr[strlen(optstr)-1]='\0'; + if (strlen(optstr)>1) optstr[strlen(optstr)-1]='\0'; return optstr; } @@ -51,7 +52,7 @@ main (int argc, char **argv) { char *optstr=NULL; - plan_tests(4); + plan_tests(9); optstr=list2str(np_get_defaults("section@./config-tiny.ini", "check_disk")); ok( !strcmp(optstr, "--one=two --Foo=Bar --this=Your Mother! --blank="), "config-tiny.ini's section as expected"); @@ -61,42 +62,33 @@ main (int argc, char **argv) ok( !strcmp(optstr, "--one=two --Foo=Bar --this=Your Mother! --blank="), "Used default section name, without specific"); my_free(optstr); - /* This test currently crashes */ - /* - optstr=np_get_defaults("section_unknown@./config-tiny.ini", "section"); + optstr=list2str(np_get_defaults("section_unknown@./config-tiny.ini", "section")); ok( !strcmp(optstr, "--one=two --Foo=Bar --this=Your Mother! --blank="), "Used default section name over specified one"); my_free(optstr); - */ optstr=list2str(np_get_defaults("Section Two@./config-tiny.ini", "check_disk")); ok( !strcmp(optstr, "--something else=blah --remove=whitespace"), "config-tiny.ini's Section Two as expected"); my_free(optstr); - /* These tests currently crash parse_ini.c */ - /* - optstr=np_get_defaults("/path/to/file.txt@./config-tiny.ini", "check_disk"); + optstr=list2str(np_get_defaults("/path/to/file.txt@./config-tiny.ini", "check_disk")); ok( !strcmp(optstr, "--this=that"), "config-tiny.ini's filename as section name"); my_free(optstr); - optstr=np_get_defaults("section2@./config-tiny.ini", "check_disk"); + optstr=list2str(np_get_defaults("section2@./config-tiny.ini", "check_disk")); ok( !strcmp(optstr, "--this=that"), "config-tiny.ini's section2 with whitespace before section name"); my_free(optstr); - optstr=np_get_defaults("section3@./config-tiny.ini", "check_disk"); + optstr=list2str(np_get_defaults("section3@./config-tiny.ini", "check_disk")); ok( !strcmp(optstr, "--this=that"), "config-tiny.ini's section3 with whitespace after section name"); my_free(optstr); - */ optstr=list2str(np_get_defaults("check_mysql@./plugin.ini", "check_disk")); ok( !strcmp(optstr, "--username=operator --password=secret"), "plugin.ini's check_mysql as expected"); my_free(optstr); - /* This test crashes at the moment. I think it is not expecting single character parameter names */ - /* - optstr=np_get_defaults("check_mysql2@./config-tiny.ini", "check_disk"); + optstr=list2str(np_get_defaults("check_mysql2@./plugin.ini", "check_disk")); ok( !strcmp(optstr, "-u=admin -p=secret"), "plugin.ini's check_mysql2 as expected"); my_free(optstr); - */ return exit_status(); } |