[icinga-checkins] icinga.org: icinga-core/dev/cgis: Fix config path

git at icinga.org git at icinga.org
Sat Feb 25 15:43:48 CET 2012


Module: icinga-core
Branch: dev/cgis
Commit: 06c78cd7a57bacf9b9505c0773a5c44f3708bd82
URL:    https://git.icinga.org/?p=icinga-core.git;a=commit;h=06c78cd7a57bacf9b9505c0773a5c44f3708bd82

Author: Alexander Wirt <formorer at debian.org>
Date:   Sat Feb 25 12:05:41 2012 +0100

Fix config path

---

 t/621extinfo.t.disabled                |   40 --------------------------------
 t/etc/icinga-with-generated-status.cfg |    2 +-
 2 files changed, 1 insertions(+), 41 deletions(-)

diff --git a/t/621extinfo.t.disabled b/t/621extinfo.t.disabled
deleted file mode 100644
index 4c606e2..0000000
--- a/t/621extinfo.t.disabled
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/usr/bin/perl
-
-use warnings;
-use strict;
-use FindBin qw($Bin);
-
-use Test::More;
-
-eval "use Test::HTML::Lint";
-if ($@) {
-	plan skip_all => "Need Test::HTML::Lint";
-}
-
-eval "use Test::WWW::Mechanize::CGI";
-if ($@) {
-	plan skip_all => "Need Test::WWW::Mechanize::CGI";
-}
-
-my $lint;
-eval '$lint = HTML::Lint->new( only_types => HTML::Lint::Error::STRUCTURE )';
-
-plan tests => 3;
-
-chdir $Bin or die "Cannot chdir";
-
-my $topdir = "$Bin/..";
-my $cgi_dir = "$topdir/cgi";
-
-my $mech = Test::WWW::Mechanize::CGI->new;
-
-$mech->env( REMOTE_USER => "icingaadmin" );
-$mech->env( ICINGA_CGI_CONFIG => "etc/cgi.cfg" );
-$mech->env( QUERY_STRING => "nodaemoncheck" );
-$mech->cgi_application("$cgi_dir/extinfo.cgi");
-
-$mech->get_ok("http://localhost/");
-
-$mech->title_is("Extended Information");
-html_ok( $lint, $mech->content, "HTML correct" );
-
diff --git a/t/etc/icinga-with-generated-status.cfg b/t/etc/icinga-with-generated-status.cfg
index a853f18..1a6d3e1 100644
--- a/t/etc/icinga-with-generated-status.cfg
+++ b/t/etc/icinga-with-generated-status.cfg
@@ -28,7 +28,7 @@ log_file=var/icinga.log
 
 # Note: A relative path here is relative to the location of the overall icinga.cfg file,
 # not relative to the current directory
-cfg_file=minimal.cfg
+cfg_file=etc/minimal.cfg
 
 # You can also tell Nagios to process all config files (with a .cfg
 # extension) in a particular directory by using the cfg_dir





More information about the icinga-checkins mailing list