From dc31f1cd3841d486e920e59ce42e888ca94e4289 Mon Sep 17 00:00:00 2001 From: Gavin Carr Date: Wed, 21 Mar 2007 00:52:56 +0000 Subject: Finished initial --extra-opts support; added Getopt spec-to-help and multiline help support. git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/Nagios-Plugin/trunk@1643 f882894a-f735-0410-b71e-b25c423dba1c --- t/npg03/README | 18 ++++++++++-------- t/npg03/expected/00_noextra | 1 + t/npg03/expected/05_disk1 | 1 + t/npg03/expected/05_disk2 | 1 + t/npg03/expected/05_disk3 | 1 + t/npg03/expected/05_disk4 | 1 + t/npg03/expected/05_disk5 | 1 + t/npg03/expected/05_disk6 | 1 + t/npg03/expected/05_singlechar1 | 1 - t/npg03/expected/06_singlechar2 | 1 - t/npg03/expected/07_singlechar3 | 1 - t/npg03/input/00_basic | 2 +- t/npg03/input/00_noextra | 1 + t/npg03/input/01_override1 | 2 +- t/npg03/input/02_override2 | 2 +- t/npg03/input/05_disk1 | 1 + t/npg03/input/05_disk2 | 1 + t/npg03/input/05_disk3 | 1 + t/npg03/input/05_disk4 | 1 + t/npg03/input/05_disk5 | 1 + t/npg03/input/05_disk6 | 1 + t/npg03/input/05_singlechar1 | 1 - t/npg03/input/06_singlechar2 | 1 - t/npg03/input/07_singlechar3 | 1 - t/npg03/input/09_funnystuff | 2 +- t/npg03/input/13_nosection_explicit_dies | 2 +- t/npg03/input/14_badsection_dies | 2 +- t/npg03/plugins.cfg | 21 --------------------- t/npg03/plugins.ini | 30 ++++++++++++++++++++++++++++++ 29 files changed, 60 insertions(+), 41 deletions(-) create mode 100644 t/npg03/expected/00_noextra create mode 100644 t/npg03/expected/05_disk1 create mode 100644 t/npg03/expected/05_disk2 create mode 100644 t/npg03/expected/05_disk3 create mode 100644 t/npg03/expected/05_disk4 create mode 100644 t/npg03/expected/05_disk5 create mode 100644 t/npg03/expected/05_disk6 delete mode 100644 t/npg03/expected/05_singlechar1 delete mode 100644 t/npg03/expected/06_singlechar2 delete mode 100644 t/npg03/expected/07_singlechar3 create mode 100644 t/npg03/input/00_noextra create mode 100644 t/npg03/input/05_disk1 create mode 100644 t/npg03/input/05_disk2 create mode 100644 t/npg03/input/05_disk3 create mode 100644 t/npg03/input/05_disk4 create mode 100644 t/npg03/input/05_disk5 create mode 100644 t/npg03/input/05_disk6 delete mode 100644 t/npg03/input/05_singlechar1 delete mode 100644 t/npg03/input/06_singlechar2 delete mode 100644 t/npg03/input/07_singlechar3 delete mode 100644 t/npg03/plugins.cfg create mode 100644 t/npg03/plugins.ini (limited to 't/npg03') diff --git a/t/npg03/README b/t/npg03/README index a19f263..3dbdaf8 100644 --- a/t/npg03/README +++ b/t/npg03/README @@ -1,13 +1,15 @@ -Nagios-Plugin-Getopt-03.t automatically tests all cases defined in the 'input' directory -and expects the output to match the corresponding file in the 'expected' directory. To -define a new test case, just create a new file in the 'input' directory containing the -input command line, and a corresponding file in the 'expected' directory containing -what you think the expanded command line should be. Note that this expansion is normalised -as follows: +Nagios-Plugin-Getopt-03.t automatically tests all cases defined in +the 'input' directory and expects the output to match the +corresponding file in the 'expected' directory. To define a new test +case, just create a new file in the 'input' directory containing the +input command line, and a corresponding file in the 'expected' +directory containing what you think the expanded command line should +be. Note that this expansion is normalised as follows: - command line arguments are reported in alphabetical order - extraneous white space is removed -Also, if you use a completely new argument than those defined in Nagios-Plugin-Getopt-03.t -you will need to define it there as well. +Also, if you use a completely new argument than those currently +defined in Nagios-Plugin-Getopt-03.t you will need to define it +there as well. diff --git a/t/npg03/expected/00_noextra b/t/npg03/expected/00_noextra new file mode 100644 index 0000000..d649587 --- /dev/null +++ b/t/npg03/expected/00_noextra @@ -0,0 +1 @@ +check_mysql -H localhost -S diff --git a/t/npg03/expected/05_disk1 b/t/npg03/expected/05_disk1 new file mode 100644 index 0000000..5570904 --- /dev/null +++ b/t/npg03/expected/05_disk1 @@ -0,0 +1 @@ +check_disk -p /tmp -p /home diff --git a/t/npg03/expected/05_disk2 b/t/npg03/expected/05_disk2 new file mode 100644 index 0000000..692890b --- /dev/null +++ b/t/npg03/expected/05_disk2 @@ -0,0 +1 @@ +check_disk -p /tmp -p /home -p /users diff --git a/t/npg03/expected/05_disk3 b/t/npg03/expected/05_disk3 new file mode 100644 index 0000000..5252b4e --- /dev/null +++ b/t/npg03/expected/05_disk3 @@ -0,0 +1 @@ +check_disk -p /tmp -p /var diff --git a/t/npg03/expected/05_disk4 b/t/npg03/expected/05_disk4 new file mode 100644 index 0000000..34b382e --- /dev/null +++ b/t/npg03/expected/05_disk4 @@ -0,0 +1 @@ +check_disk -p /tmp -p /var -p /home diff --git a/t/npg03/expected/05_disk5 b/t/npg03/expected/05_disk5 new file mode 100644 index 0000000..ae61e62 --- /dev/null +++ b/t/npg03/expected/05_disk5 @@ -0,0 +1 @@ +check_disk -p /var -p /tmp -p /home diff --git a/t/npg03/expected/05_disk6 b/t/npg03/expected/05_disk6 new file mode 100644 index 0000000..dc4870a --- /dev/null +++ b/t/npg03/expected/05_disk6 @@ -0,0 +1 @@ +check_disk2 --critical=5% --path=/var --path=/home --path=/usr --units=GB --warning=10% diff --git a/t/npg03/expected/05_singlechar1 b/t/npg03/expected/05_singlechar1 deleted file mode 100644 index 13a3f9b..0000000 --- a/t/npg03/expected/05_singlechar1 +++ /dev/null @@ -1 +0,0 @@ -check_disk -p /home diff --git a/t/npg03/expected/06_singlechar2 b/t/npg03/expected/06_singlechar2 deleted file mode 100644 index 8f9df5e..0000000 --- a/t/npg03/expected/06_singlechar2 +++ /dev/null @@ -1 +0,0 @@ -check_disk -p /var diff --git a/t/npg03/expected/07_singlechar3 b/t/npg03/expected/07_singlechar3 deleted file mode 100644 index f4e6ed7..0000000 --- a/t/npg03/expected/07_singlechar3 +++ /dev/null @@ -1 +0,0 @@ -check_disk -p /home -p /users diff --git a/t/npg03/input/00_basic b/t/npg03/input/00_basic index 4c16788..f35f3c7 100644 --- a/t/npg03/input/00_basic +++ b/t/npg03/input/00_basic @@ -1 +1 @@ -check_mysql -S --default-opts= --default-opts=more_options -H localhost +check_mysql -S --extra-opts= --extra-opts=more_options -H localhost diff --git a/t/npg03/input/00_noextra b/t/npg03/input/00_noextra new file mode 100644 index 0000000..4d8a8fc --- /dev/null +++ b/t/npg03/input/00_noextra @@ -0,0 +1 @@ +check_mysql -S -H localhost diff --git a/t/npg03/input/01_override1 b/t/npg03/input/01_override1 index 9e051e9..f3cd232 100644 --- a/t/npg03/input/01_override1 +++ b/t/npg03/input/01_override1 @@ -1 +1 @@ -check_mysql --username=admin --default-opts=more_options --warning=5 +check_mysql --username=admin --extra-opts=more_options --warning=5 diff --git a/t/npg03/input/02_override2 b/t/npg03/input/02_override2 index ceabe55..fa96ff7 100644 --- a/t/npg03/input/02_override2 +++ b/t/npg03/input/02_override2 @@ -1 +1 @@ -check_mysql --default-opts= -u admin +check_mysql --extra-opts= -u admin diff --git a/t/npg03/input/05_disk1 b/t/npg03/input/05_disk1 new file mode 100644 index 0000000..5ccfe23 --- /dev/null +++ b/t/npg03/input/05_disk1 @@ -0,0 +1 @@ +check_disk --extra-opts= -p /home diff --git a/t/npg03/input/05_disk2 b/t/npg03/input/05_disk2 new file mode 100644 index 0000000..53e36d9 --- /dev/null +++ b/t/npg03/input/05_disk2 @@ -0,0 +1 @@ +check_disk --extra-opts= -p /home -p /users diff --git a/t/npg03/input/05_disk3 b/t/npg03/input/05_disk3 new file mode 100644 index 0000000..441accb --- /dev/null +++ b/t/npg03/input/05_disk3 @@ -0,0 +1 @@ +check_disk --extra-opts=check_2_disks diff --git a/t/npg03/input/05_disk4 b/t/npg03/input/05_disk4 new file mode 100644 index 0000000..da9d810 --- /dev/null +++ b/t/npg03/input/05_disk4 @@ -0,0 +1 @@ +check_disk -p /home --extra-opts=check_2_disks diff --git a/t/npg03/input/05_disk5 b/t/npg03/input/05_disk5 new file mode 100644 index 0000000..9ba2d40 --- /dev/null +++ b/t/npg03/input/05_disk5 @@ -0,0 +1 @@ +check_disk -p /home --extra-opts=check_2_disks_reprise diff --git a/t/npg03/input/05_disk6 b/t/npg03/input/05_disk6 new file mode 100644 index 0000000..c240d9c --- /dev/null +++ b/t/npg03/input/05_disk6 @@ -0,0 +1 @@ +check_disk2 --warning=10% --critical=5% --extra-opts= --path=/usr diff --git a/t/npg03/input/05_singlechar1 b/t/npg03/input/05_singlechar1 deleted file mode 100644 index 1edb8bf..0000000 --- a/t/npg03/input/05_singlechar1 +++ /dev/null @@ -1 +0,0 @@ -check_disk --default-opts= -p /home diff --git a/t/npg03/input/06_singlechar2 b/t/npg03/input/06_singlechar2 deleted file mode 100644 index 24965c7..0000000 --- a/t/npg03/input/06_singlechar2 +++ /dev/null @@ -1 +0,0 @@ -check_disk --default-opts=check_2_disks diff --git a/t/npg03/input/07_singlechar3 b/t/npg03/input/07_singlechar3 deleted file mode 100644 index 0abc70f..0000000 --- a/t/npg03/input/07_singlechar3 +++ /dev/null @@ -1 +0,0 @@ -check_disk --default-opts= -p /home -p /users diff --git a/t/npg03/input/09_funnystuff b/t/npg03/input/09_funnystuff index c2d6160..ab279d9 100644 --- a/t/npg03/input/09_funnystuff +++ b/t/npg03/input/09_funnystuff @@ -1 +1 @@ -check_disk --default-opts=funny_stuff +check_disk --extra-opts=funny_stuff diff --git a/t/npg03/input/13_nosection_explicit_dies b/t/npg03/input/13_nosection_explicit_dies index 90aab51..f18660e 100644 --- a/t/npg03/input/13_nosection_explicit_dies +++ b/t/npg03/input/13_nosection_explicit_dies @@ -1 +1 @@ -check_no_section --default-opts= -H localhost +check_no_section --extra-opts= -H localhost diff --git a/t/npg03/input/14_badsection_dies b/t/npg03/input/14_badsection_dies index 70815a9..6b1c20a 100644 --- a/t/npg03/input/14_badsection_dies +++ b/t/npg03/input/14_badsection_dies @@ -1 +1 @@ -check_no_section --default-opts=bad_section +check_no_section --extra-opts=bad_section diff --git a/t/npg03/plugins.cfg b/t/npg03/plugins.cfg deleted file mode 100644 index f893a21..0000000 --- a/t/npg03/plugins.cfg +++ /dev/null @@ -1,21 +0,0 @@ -[check_mysql] -username=tonvoon -password=secret - -[more_options] -username=altinity -warning=10 -critical=15 - -[check_disk] -p=/tmp - -[check_2_disks] -p=/tmp -p=/var - -[funny_stuff] -username="Ton Voon" -p= -expect=" space in front" - diff --git a/t/npg03/plugins.ini b/t/npg03/plugins.ini new file mode 100644 index 0000000..2d3c551 --- /dev/null +++ b/t/npg03/plugins.ini @@ -0,0 +1,30 @@ +[check_mysql] +username=tonvoon +password=secret + +[more_options] +username=altinity +warning=10 +critical=15 + +[check_disk] +p=/tmp + +[check_2_disks] +p=/tmp +p=/var + +[check_2_disks_reprise] +p=/var +p=/tmp + +[check_disk2] +path=/var +path=/home +units=GB + +[funny_stuff] +username="Ton Voon" +p= +expect=" space in front" + -- cgit v1.2.3-74-g34f1