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

View File

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

View File

@ -89,12 +89,12 @@ class TestSuite(object):
subprocess.call(command, shell=True)
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)))
def _run_test(self, path):
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))
p = subprocess.Popen(command.format(target), stdout=subprocess.PIPE,
stderr=subprocess.PIPE, shell=True)