Skip to content

Commit 9bcccce

Browse files
committed
Check daemons configured directories (eg. logdir, workdir...) - fix some broken tests
1 parent 7295d08 commit 9bcccce

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

tests_integ/alignak_test.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -287,7 +287,7 @@ def _prepare_configuration(self, copy=True, cfg_folder='/tmp/alignak', daemons_l
287287
cfg.set('alignak-configuration', 'cfg', '%s/etc/alignak.cfg' % cfg_folder)
288288

289289
# Directory for running daemons
290-
cfg.set('alignak-configuration', 'daemons_script_location', '/usr/local/bin')
290+
cfg.set('alignak-configuration', 'daemons_script_location', '')
291291

292292
# Daemons launching and check
293293
cfg.set('alignak-configuration', 'polling_interval', '1')
@@ -509,7 +509,7 @@ def _run_alignak_daemons(self, cfg_folder='/tmp/alignak', runtime=30,
509509
cfg.set('alignak-configuration', 'cfg', '%s/etc/alignak.cfg' % cfg_folder)
510510

511511
# Directory for running daemons
512-
cfg.set('alignak-configuration', 'daemons_script_location', '/usr/local/bin')
512+
cfg.set('alignak-configuration', 'daemons_script_location', '')
513513

514514
# Daemons launching and check
515515
cfg.set('alignak-configuration', 'polling_interval', '1')

tests_integ/test_daemons_api.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ def _prepare_my_configuration(self, daemons_list=None, remove_daemons=None,
108108
cfg.read(files)
109109

110110
# Directory for running daemons
111-
cfg.set('alignak-configuration', 'daemons_script_location', '/usr/local/bin')
111+
cfg.set('alignak-configuration', 'daemons_script_location', '')
112112

113113
cfg.set('alignak-configuration', 'launch_missing_daemons', '1')
114114

0 commit comments

Comments
 (0)