x/vmware-nsx
Code Issues Proposed changes

Merge "Set timeout for functional job"

Browse Source
This commit is contained in:
Jenkins 2014-12-16 06:01:03 +00:00 committed by Gerrit Code Review
commit 8acface007
3 changed files with 36 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
neutron/tests/functional/agent/linux/test_async_process.py
View File

@ -41,7 +41,6 @@ class TestAsyncProcess(base.BaseTestCase):
eventlet.sleep(0.01) eventlet.sleep(0.01)
def test_stopping_async_process_lifecycle(self): def test_stopping_async_process_lifecycle(self):
with self.assert_max_execution_time():
proc = async_process.AsyncProcess(['tail', '-f', proc = async_process.AsyncProcess(['tail', '-f',
self.test_file_path]) self.test_file_path])
proc.start() proc.start()
@ -55,7 +54,6 @@ class TestAsyncProcess(base.BaseTestCase):
watcher.wait() watcher.wait()
def test_async_process_respawns(self): def test_async_process_respawns(self):
with self.assert_max_execution_time():
proc = async_process.AsyncProcess(['tail', '-f', proc = async_process.AsyncProcess(['tail', '-f',
self.test_file_path], self.test_file_path],
respawn_interval=0) respawn_interval=0)

2
neutron/tests/functional/agent/linux/test_ovsdb_monitor.py
View File

@ -74,7 +74,6 @@ class TestOvsdbMonitor(BaseMonitorTest):
eventlet.sleep(0.01) eventlet.sleep(0.01)
def test_killed_monitor_respawns(self): def test_killed_monitor_respawns(self):
with self.assert_max_execution_time():
self.monitor.respawn_interval = 0 self.monitor.respawn_interval = 0
old_pid = self.monitor._process.pid old_pid = self.monitor._process.pid
output1 = self.collect_initial_output() output1 = self.collect_initial_output()
@ -104,7 +103,6 @@ class TestSimpleInterfaceMonitor(BaseMonitorTest):
self.assertFalse(self.monitor.has_updates, self.assertFalse(self.monitor.has_updates,
'has_updates without port addition should be False') 'has_updates without port addition should be False')
self.create_resource('test-port-', self.bridge.add_port) self.create_resource('test-port-', self.bridge.add_port)
with self.assert_max_execution_time():
# has_updates after port addition should become True # has_updates after port addition should become True
while not self.monitor.has_updates: while not self.monitor.has_updates:
eventlet.sleep(0.01) eventlet.sleep(0.01)

2
tox.ini
View File

@ -26,12 +26,14 @@ setenv = VIRTUAL_ENV={envdir}
[testenv:functional] [testenv:functional]
setenv = OS_TEST_PATH=./neutron/tests/functional setenv = OS_TEST_PATH=./neutron/tests/functional
OS_TEST_TIMEOUT=90
[testenv:dsvm-functional] [testenv:dsvm-functional]
setenv = OS_TEST_PATH=./neutron/tests/functional setenv = OS_TEST_PATH=./neutron/tests/functional
OS_SUDO_TESTING=1 OS_SUDO_TESTING=1
OS_ROOTWRAP_CMD=sudo /usr/local/bin/neutron-rootwrap /etc/neutron/rootwrap.conf OS_ROOTWRAP_CMD=sudo /usr/local/bin/neutron-rootwrap /etc/neutron/rootwrap.conf
OS_FAIL_ON_MISSING_DEPS=1 OS_FAIL_ON_MISSING_DEPS=1
OS_TEST_TIMEOUT=90
sitepackages=True sitepackages=True
[tox:jenkins] [tox:jenkins]