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

Fix the vm-test runner's error handling

This commit is contained in:
Johannes Meyer 2014-02-05 13:22:27 +01:00
parent a7e237640f
commit 862f61d93b
2 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
test/jenkins/files/utils.py
View File

@ -117,9 +117,14 @@ class LiveStatusSocket(object):
while not self._connected and time.time() - start < timeout: while not self._connected and time.time() - start < timeout:
try: try:
self.connect() self.connect()
except socket.error, error: except socket.error:
if error.errno != 111: # Icinga2 does some "magic" with the socket during startup
raise # which causes random errors being raised (EACCES, ENOENT, ..)
# so we just ignore them until the timeout is reached
time.sleep(1)
if not self._connected:
# Raise the very last exception once the timeout is reached
raise
def close(self): def close(self):
if self._connected: if self._connected:

14
test/jenkins/run_tests.py
View File

@ -85,15 +85,23 @@ class TestSuite(object):
def _remove_file(self, path): def _remove_file(self, path):
command = self._config['commands']['clean'].format(path) command = self._config['commands']['clean'].format(path)
subprocess.call(command, stdout=DEVNULL, shell=True) rc = subprocess.call(command, stdout=DEVNULL, shell=True)
if rc != 0:
print 'WARNING: Cannot remove file "{0}" ({1})'.format(path, rc)
def _exec_command(self, command): def _exec_command(self, command):
command = self._config['commands']['exec'].format(command) command = self._config['commands']['exec'].format(command)
subprocess.call(command, stdout=DEVNULL, shell=True) rc = subprocess.call(command, stdout=DEVNULL, shell=True)
if rc != 0:
print 'WARNING: Command "{0}" exited with exit code "{1}"' \
''.format(command, rc)
def _copy_file(self, source, destination): def _copy_file(self, source, destination):
command = self._config['commands']['copy'].format(source, destination) command = self._config['commands']['copy'].format(source, destination)
subprocess.call(command, stdout=DEVNULL, shell=True) rc = subprocess.call(command, stdout=DEVNULL, shell=True)
if rc != 0:
print 'WARNING: Cannot copy file "{0}" to "{1}" ({2})' \
''.format(source, destination, rc)
def _copy_test(self, path): def _copy_test(self, path):
self._copy_file(path, os.path.join(self._config['settings']['test_root'], self._copy_file(path, os.path.join(self._config['settings']['test_root'],