]> review.fuel-infra Code Review - openstack-build/neutron-build.git/commit
Fix functional test using local timeout value
authorMaru Newby <marun@redhat.com>
Fri, 3 Apr 2015 01:10:07 +0000 (01:10 +0000)
committerArmando Migliaccio <armamig@gmail.com>
Fri, 3 Apr 2015 01:18:15 +0000 (01:18 +0000)
commit6c4091418eec5f40bd2fe0c264b1d7d2b70894da
treed69c14ca208ca8afaf163451589d9e886b495e29
parent10286abe752f9baff92f9326bea6d176a46ed8af
Fix functional test using local timeout value

The ovsdb monitor test was using a timeout of 60s for monitor start.
This change sets the timeout to the global timeout value if it is
greater (it's 90s currently).

Closes-bug: #1439914

Change-Id: I95ee3d7dfdb5f010347a9d8db1b2bf610c0289d1
neutron/tests/base.py
neutron/tests/functional/agent/linux/test_ovsdb_monitor.py