[icinga-checkins] icinga.org: icinga-core/mfriedrich/fixes: refactor perl test to use icingaadmin

git at icinga.org git at icinga.org
Sun Jan 10 08:40:18 CET 2010


Module: icinga-core
Branch: mfriedrich/fixes
Commit: 1241a6b743893928c5481b39e4d4584052c46023
URL:    https://git.icinga.org/?p=icinga-core.git;a=commit;h=1241a6b743893928c5481b39e4d4584052c46023

Author: Hendrik Baecker <andurin at process-zero.de>
Date:   Sat Jan  9 17:47:27 2010 +0100

refactor perl test to use icingaadmin

---

 t/621extinfo.t                      |    2 +-
 t/622extinfo-local.t                |    2 +-
 t/660status-downtimes-comments.t    |    2 +-
 t/etc/cgi-with-generated-status.cfg |   14 +++++++-------
 t/etc/cgi.cfg                       |   14 +++++++-------
 t/etc/minimal.cfg                   |   10 +++++-----
 t/etc/no-service-error.cfg          |    6 +++---
 t/var/objects.precache.expected     |   10 +++++-----
 8 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/t/621extinfo.t b/t/621extinfo.t
index 516c47c..0367a22 100644
--- a/t/621extinfo.t
+++ b/t/621extinfo.t
@@ -28,7 +28,7 @@ my $cgi_dir = "$topdir/cgi";
 
 my $mech = Test::WWW::Mechanize::CGI->new;
 
-$mech->env( REMOTE_USER => "nagiosadmin" );
+$mech->env( REMOTE_USER => "icingaadmin" );
 $mech->env( NAGIOS_CGI_CONFIG => "etc/cgi.cfg" );
 $mech->cgi_application("$cgi_dir/extinfo.cgi");
 
diff --git a/t/622extinfo-local.t b/t/622extinfo-local.t
index 5aa9c13..c247a5e 100644
--- a/t/622extinfo-local.t
+++ b/t/622extinfo-local.t
@@ -14,7 +14,7 @@ my $cgi_dir = "$topdir/cgi";
 my $extinfo_cgi = "$cgi_dir/extinfo.cgi";
 
 my $output;
-my $remote_user = "REMOTE_USER=nagiosadmin";
+my $remote_user = "REMOTE_USER=icingaadmin";
 
 plan tests => 2;
 
diff --git a/t/660status-downtimes-comments.t b/t/660status-downtimes-comments.t
index 54d91a9..dc8a652 100644
--- a/t/660status-downtimes-comments.t
+++ b/t/660status-downtimes-comments.t
@@ -43,7 +43,7 @@ while($iteration <= $iterations_max) {
 	# As the test status.dat generator is in a random order, the output will also be in the same
 	# random order
 	# Check that the comments ids are sorted
-	#$output = `NAGIOS_CGI_CONFIG=etc/cgi-with-generated-status.cfg REQUEST_METHOD=GET REMOTE_USER=nagiosadmin QUERY_STRING="type=2&host=host1&service=Dummy+service" $extinfo_cgi`;
+	#$output = `NAGIOS_CGI_CONFIG=etc/cgi-with-generated-status.cfg REQUEST_METHOD=GET REMOTE_USER=icingaadmin QUERY_STRING="type=2&host=host1&service=Dummy+service" $extinfo_cgi`;
 	#check_decrementing_comment_ids();
 
 	$iteration++;
diff --git a/t/etc/cgi-with-generated-status.cfg b/t/etc/cgi-with-generated-status.cfg
index 428f347..7f5c71b 100644
--- a/t/etc/cgi-with-generated-status.cfg
+++ b/t/etc/cgi-with-generated-status.cfg
@@ -116,7 +116,7 @@ use_ssl_authentication=0
 # not use authorization.  You may use an asterisk (*) to
 # authorize any user who has authenticated to the web server.
 
-authorized_for_system_information=nagiosadmin
+authorized_for_system_information=icingaadmin
 
 
 
@@ -128,7 +128,7 @@ authorized_for_system_information=nagiosadmin
 # an asterisk (*) to authorize any user who has authenticated
 # to the web server.
 
-authorized_for_configuration_information=nagiosadmin
+authorized_for_configuration_information=icingaadmin
 
 
 
@@ -141,7 +141,7 @@ authorized_for_configuration_information=nagiosadmin
 # You may use an asterisk (*) to authorize any user who has
 # authenticated to the web server.
 
-authorized_for_system_commands=nagiosadmin
+authorized_for_system_commands=icingaadmin
 
 
 
@@ -154,8 +154,8 @@ authorized_for_system_commands=nagiosadmin
 # to authorize any user who has authenticated to the web server.
 
 
-authorized_for_all_services=nagiosadmin
-authorized_for_all_hosts=nagiosadmin
+authorized_for_all_services=icingaadmin
+authorized_for_all_hosts=icingaadmin
 
 
 
@@ -168,8 +168,8 @@ authorized_for_all_hosts=nagiosadmin
 # authorization).  You may use an asterisk (*) to authorize any
 # user who has authenticated to the web server.
 
-authorized_for_all_service_commands=nagiosadmin
-authorized_for_all_host_commands=nagiosadmin
+authorized_for_all_service_commands=icingaadmin
+authorized_for_all_host_commands=icingaadmin
 
 
 
diff --git a/t/etc/cgi.cfg b/t/etc/cgi.cfg
index a15825b..cc8f917 100644
--- a/t/etc/cgi.cfg
+++ b/t/etc/cgi.cfg
@@ -116,7 +116,7 @@ use_ssl_authentication=0
 # not use authorization.  You may use an asterisk (*) to
 # authorize any user who has authenticated to the web server.
 
-authorized_for_system_information=nagiosadmin
+authorized_for_system_information=icingaadmin
 
 
 
@@ -128,7 +128,7 @@ authorized_for_system_information=nagiosadmin
 # an asterisk (*) to authorize any user who has authenticated
 # to the web server.
 
-authorized_for_configuration_information=nagiosadmin
+authorized_for_configuration_information=icingaadmin
 
 
 
@@ -141,7 +141,7 @@ authorized_for_configuration_information=nagiosadmin
 # You may use an asterisk (*) to authorize any user who has
 # authenticated to the web server.
 
-authorized_for_system_commands=nagiosadmin
+authorized_for_system_commands=icingaadmin
 
 
 
@@ -154,8 +154,8 @@ authorized_for_system_commands=nagiosadmin
 # to authorize any user who has authenticated to the web server.
 
 
-authorized_for_all_services=nagiosadmin
-authorized_for_all_hosts=nagiosadmin
+authorized_for_all_services=icingaadmin
+authorized_for_all_hosts=icingaadmin
 
 
 
@@ -168,8 +168,8 @@ authorized_for_all_hosts=nagiosadmin
 # authorization).  You may use an asterisk (*) to authorize any
 # user who has authenticated to the web server.
 
-authorized_for_all_service_commands=nagiosadmin
-authorized_for_all_host_commands=nagiosadmin
+authorized_for_all_service_commands=icingaadmin
+authorized_for_all_host_commands=icingaadmin
 
 
 
diff --git a/t/etc/minimal.cfg b/t/etc/minimal.cfg
index e879091..4868a34 100644
--- a/t/etc/minimal.cfg
+++ b/t/etc/minimal.cfg
@@ -4,7 +4,7 @@ define host {
 	address	192.168.1.1
 	max_check_attempts 2
 	check_period	none
-	contacts	nagiosadmin
+	contacts	icingaadmin
 	notification_interval 60
 	notification_period none
 }
@@ -19,7 +19,7 @@ define service {
 	check_period	none
 	notification_interval	60
 	notification_period	none
-	contacts	nagiosadmin
+	contacts	icingaadmin
 }
 
 define service {
@@ -32,7 +32,7 @@ define service {
 	check_period	none
 	notification_interval	65
 	notification_period	none
-	contacts	nagiosadmin
+	contacts	icingaadmin
 	use	service-distributed
 }
 
@@ -71,7 +71,7 @@ define timeperiod {
 }
 
 define contact {
-	contact_name	nagiosadmin
+	contact_name	icingaadmin
 	host_notifications_enabled	0
 	service_notifications_enabled	0
 	host_notification_period	none
@@ -102,7 +102,7 @@ define contact {
 define contactgroup {
 	contactgroup_name	causetestfailure
 	alias	This causes a test failure by having a comma separated list before the empty contactgroup
-	members	nagiosadmin,second
+	members	icingaadmin,second
 }
 
 define contactgroup {
diff --git a/t/etc/no-service-error.cfg b/t/etc/no-service-error.cfg
index df3a151..420710a 100644
--- a/t/etc/no-service-error.cfg
+++ b/t/etc/no-service-error.cfg
@@ -4,7 +4,7 @@ define host {
 	address	192.168.1.1
 	max_check_attempts 2
 	check_period	none
-	contacts	nagiosadmin
+	contacts	icingaadmin
 	notification_interval 60
 	notification_period none
 }
@@ -20,7 +20,7 @@ define timeperiod {
 }
 
 define contact {
-	contact_name	nagiosadmin
+	contact_name	icingaadmin
 	host_notifications_enabled	0
 	service_notifications_enabled	0
 	host_notification_period	none
@@ -51,7 +51,7 @@ define contact {
 define contactgroup {
 	contactgroup_name	causetestfailure
 	alias	This causes a test failure by having a comma separated list before the empty contactgroup
-	members	nagiosadmin,second
+	members	icingaadmin,second
 }
 
 define contactgroup {
diff --git a/t/var/objects.precache.expected b/t/var/objects.precache.expected
index 89a482c..439c89a 100644
--- a/t/var/objects.precache.expected
+++ b/t/var/objects.precache.expected
@@ -39,7 +39,7 @@ define command {
 define contactgroup {
 	contactgroup_name	causetestfailure
 	alias	This causes a test failure by having a comma separated list before the empty contactgroup
-	members	second,nagiosadmin
+	members	second,icingaadmin
 	}
 
 define contactgroup {
@@ -48,7 +48,7 @@ define contactgroup {
 	}
 
 define contact {
-	contact_name	nagiosadmin
+	contact_name	icingaadmin
 	service_notification_period	none
 	host_notification_period	none
 	service_notification_options	w,u,c,r,f,s
@@ -82,7 +82,7 @@ define host {
 	alias	host1 test
 	address	192.168.1.1
 	check_period	none
-	contacts	nagiosadmin
+	contacts	icingaadmin
 	notification_period	none
 	initial_state	o
 	check_interval	5.000000
@@ -114,7 +114,7 @@ define service {
 	service_description	Dummy service
 	check_period	none
 	check_command	check_me
-	contacts	nagiosadmin
+	contacts	icingaadmin
 	notification_period	none
 	initial_state	o
 	check_interval	32.000000
@@ -148,7 +148,7 @@ define service {
 	service_description	Uses important check command
 	check_period	none
 	check_command	set_to_stale
-	contacts	nagiosadmin
+	contacts	icingaadmin
 	notification_period	none
 	initial_state	o
 	check_interval	15.000000





More information about the icinga-checkins mailing list