Set timeout for functional job
As functional jobs take more time to finish than unit tests and also there is a chance that test will hang due to system interaction, this patch sets maximum execution time to 90 seconds per test. Change-Id: Ib58a1b53ace178e1bf99150628fa5576b079e8bc
This commit is contained in:
parent
e6aada633f
commit
081c684584
|
@ -41,7 +41,6 @@ class TestAsyncProcess(base.BaseTestCase):
|
|||
eventlet.sleep(0.01)
|
||||
|
||||
def test_stopping_async_process_lifecycle(self):
|
||||
with self.assert_max_execution_time():
|
||||
proc = async_process.AsyncProcess(['tail', '-f',
|
||||
self.test_file_path])
|
||||
proc.start()
|
||||
|
@ -55,7 +54,6 @@ class TestAsyncProcess(base.BaseTestCase):
|
|||
watcher.wait()
|
||||
|
||||
def test_async_process_respawns(self):
|
||||
with self.assert_max_execution_time():
|
||||
proc = async_process.AsyncProcess(['tail', '-f',
|
||||
self.test_file_path],
|
||||
respawn_interval=0)
|
||||
|
|
|
@ -74,7 +74,6 @@ class TestOvsdbMonitor(BaseMonitorTest):
|
|||
eventlet.sleep(0.01)
|
||||
|
||||
def test_killed_monitor_respawns(self):
|
||||
with self.assert_max_execution_time():
|
||||
self.monitor.respawn_interval = 0
|
||||
old_pid = self.monitor._process.pid
|
||||
output1 = self.collect_initial_output()
|
||||
|
@ -104,7 +103,6 @@ class TestSimpleInterfaceMonitor(BaseMonitorTest):
|
|||
self.assertFalse(self.monitor.has_updates,
|
||||
'has_updates without port addition should be False')
|
||||
self.create_resource('test-port-', self.bridge.add_port)
|
||||
with self.assert_max_execution_time():
|
||||
# has_updates after port addition should become True
|
||||
while not self.monitor.has_updates:
|
||||
eventlet.sleep(0.01)
|
||||
|
|
2
tox.ini
2
tox.ini
|
@ -26,12 +26,14 @@ setenv = VIRTUAL_ENV={envdir}
|
|||
|
||||
[testenv:functional]
|
||||
setenv = OS_TEST_PATH=./neutron/tests/functional
|
||||
OS_TEST_TIMEOUT=90
|
||||
|
||||
[testenv:dsvm-functional]
|
||||
setenv = OS_TEST_PATH=./neutron/tests/functional
|
||||
OS_SUDO_TESTING=1
|
||||
OS_ROOTWRAP_CMD=sudo /usr/local/bin/neutron-rootwrap /etc/neutron/rootwrap.conf
|
||||
OS_FAIL_ON_MISSING_DEPS=1
|
||||
OS_TEST_TIMEOUT=90
|
||||
sitepackages=True
|
||||
|
||||
[tox:jenkins]
|
||||
|
|
Loading…
Reference in New Issue