tyler.durden
/
icinga2
mirror of https://github.com/Icinga/icinga2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix external command tests and make livestatus a default in the vagrant vm

This commit is contained in:
Johannes Meyer 2014-02-14 11:32:46 +01:00
parent 36c0af7a85
commit 86a87b7583
2 changed files with 36 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.vagrant-puppet/modules/icinga2/manifests/init.pp
View File

@ -28,6 +28,9 @@ class icinga2 {
file { "/etc/icinga2/features-enabled/*": file { "/etc/icinga2/features-enabled/*":
notify => Service['icinga2'] notify => Service['icinga2']
} }
icinga2::feature { 'livestatus':
}
} }
class icinga2-ido-mysql { class icinga2-ido-mysql {

66
test/jenkins/external_commands.test
View File

@ -1143,51 +1143,51 @@ def test_servicegroup_commands():
def main(): def main():
failure = test_host_comments('localhost') failure = test_host_comments('localhost')
#failure = test_host_comments('nsca-ng') # Cannot work without a hostcheck! #failure &= test_host_comments('nsca-ng') # Cannot work without a hostcheck!
failure = test_service_comments('localhost', 'disk') failure &= test_service_comments('localhost', 'disk')
failure = test_service_comments('nsca-ng', 'PassiveService1') failure &= test_service_comments('nsca-ng', 'PassiveService1')
failure = test_host_downtimes('localhost') failure &= test_host_downtimes('localhost')
#failure = test_host_downtimes('nsca-ng') #failure &= test_host_downtimes('nsca-ng')
failure = test_service_downtimes('localhost', 'disk') failure &= test_service_downtimes('localhost', 'disk')
failure = test_service_downtimes('nsca-ng', 'PassiveService1') failure &= test_service_downtimes('nsca-ng', 'PassiveService1')
failure = test_host_problem_acknowledgements('localhost') failure &= test_host_problem_acknowledgements('localhost')
failure = test_remove_host_acknowledgements('localhost') failure &= test_remove_host_acknowledgements('localhost')
failure = test_expiring_host_acknowledgements('localhost') failure &= test_expiring_host_acknowledgements('localhost')
failure = test_change_host_check_command('localhost', 'disk') failure &= test_change_host_check_command('localhost', 'disk')
failure = test_change_service_check_command('localhost', 'disk', 'ping4') failure &= test_change_service_check_command('localhost', 'disk', 'ping4')
failure = test_change_host_check_timeperiod('localhost', 'none') failure &= test_change_host_check_timeperiod('localhost', 'none')
failure = test_change_service_check_timeperiod('localhost', 'disk', 'none') failure &= test_change_service_check_timeperiod('localhost', 'disk', 'none')
failure = test_change_host_max_check_attempts('localhost') failure &= test_change_host_max_check_attempts('localhost')
failure = test_change_service_max_check_attempts('localhost', 'disk') failure &= test_change_service_max_check_attempts('localhost', 'disk')
failure = test_change_host_normal_check_interval('localhost') failure &= test_change_host_normal_check_interval('localhost')
failure = test_change_service_normal_check_interval('localhost', 'disk') failure &= test_change_service_normal_check_interval('localhost', 'disk')
failure = test_change_host_retry_check_interval('localhost') failure &= test_change_host_retry_check_interval('localhost')
failure = test_change_service_retry_check_interval('localhost', 'disk') failure &= test_change_service_retry_check_interval('localhost', 'disk')
failure = test_change_host_modified_attributes('localhost') failure &= test_change_host_modified_attributes('localhost')
failure = test_delay_service_notification('localhost', 'disk') failure &= test_delay_service_notification('localhost', 'disk')
failure = test_delay_host_notification('localhost') failure &= test_delay_host_notification('localhost')
failure = test_disabling_scheduling_host_checks('localhost') failure &= test_disabling_scheduling_host_checks('localhost')
failure = test_disabling_scheduling_service_checks('localhost', 'disk') failure &= test_disabling_scheduling_service_checks('localhost', 'disk')
failure = test_shutdown_restart_process() failure &= test_shutdown_restart_process()
failure = test_passive_host_checkresult_processing('localhost') failure &= test_passive_host_checkresult_processing('localhost')
failure = test_passive_svc_checkresult_processing('localhost', 'disk') failure &= test_passive_svc_checkresult_processing('localhost', 'disk')
failure = test_process_file('localhost') failure &= test_process_file('localhost')
failure = test_custom_host_notifications('localhost') failure &= test_custom_host_notifications('localhost')
failure = test_custom_svc_notifications('localhost', 'disk') failure &= test_custom_svc_notifications('localhost', 'disk')
failure = test_hostgroup_commands() failure &= test_hostgroup_commands()
failure = test_servicegroup_commands() failure &= test_servicegroup_commands()
return 1 if failure else 0 return 1 if failure else 0