Merge "fullstack: increase test timeout"

2016-03-11 16:28:04 +00:00
parent b98c3a9413 56912b99db
commit 23f24538f1
1 changed files with 2 additions and 0 deletions
--- a/tox.ini
+++ b/tox.ini
@@ -78,6 +78,8 @@ commands =
 setenv = {[testenv]setenv}
         {[testenv:common]setenv}
         {[testenv:dsvm]setenv}
+         # workaround for DB teardown lock contention (bug/1541742)
+         OS_TEST_TIMEOUT=600
         OS_TEST_PATH=./neutron/tests/fullstack
 sitepackages=True
 deps =