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

Fix settings section in configuration file 

refs #5223
This commit is contained in:
Johannes Meyer 2013-12-04 16:23:44 +01:00
parent 9d87ce571b
commit 518d0bfd10
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
test/jenkins/run_tests.conf
View File

@ -4,8 +4,8 @@
"exec": "ssh -F ssh_config default {0}", "exec": "ssh -F ssh_config default {0}",
"clean": "ssh -F ssh_config default rm -f {0}" "clean": "ssh -F ssh_config default rm -f {0}"
}, },
"tests": { "settings": {
"destination": "/tmp" "test_root": "/tmp"
}, },
"setups": { "setups": {
} }

4
test/jenkins/run_tests.py
View File

@ -89,12 +89,12 @@ class TestSuite(object):
subprocess.call(command, shell=True) subprocess.call(command, shell=True)
def _copy_test(self, path): def _copy_test(self, path):
self._copy_file(path, os.path.join(self._config['tests']['destination'], self._copy_file(path, os.path.join(self._config['settings']['test_root'],
os.path.basename(path))) os.path.basename(path)))
def _run_test(self, path): def _run_test(self, path):
command = self._config['commands']['exec'] command = self._config['commands']['exec']
target = os.path.join(self._config['tests']['destination'], target = os.path.join(self._config['settings']['test_root'],
os.path.basename(path)) os.path.basename(path))
p = subprocess.Popen(command.format(target), stdout=subprocess.PIPE, p = subprocess.Popen(command.format(target), stdout=subprocess.PIPE,
stderr=subprocess.PIPE, shell=True) stderr=subprocess.PIPE, shell=True)