From 56912b99db1edcacd46f750a398bb71c0415ff3a Mon Sep 17 00:00:00 2001
From: IWAMOTO Toshihiro <iwamoto@valinux.co.jp>
Date: Thu, 10 Mar 2016 16:51:28 +0900
Subject: [PATCH] fullstack: increase test timeout

Database teardowns seem to have a lock contention issue.  This is a
workaround.

Change-Id: Ifd0957a86646c6a13a71b5bbf985f4694e37e943
Partial-bug: 1541742
---
 tox.ini | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tox.ini b/tox.ini
index 08ff6c32348..ae57ed9e716 100644
--- 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 =