From 4a8c52064a54c5d00d1608387729f267f7154220 Mon Sep 17 00:00:00 2001
From: Joshua Hesketh <josh@nitrotech.org>
Date: Sat, 3 Aug 2013 00:09:08 +1000
Subject: [PATCH] Fix tests to work with mysql+postgres concurrently

Optimise tests.db.test_migrations and tests.db.test_migration_utils for
concurrency and make opportunistic tests obey walk_style configurations.

Closes-Bug: 1207750

Change-Id: Idb30f144fb67aefc58749897d774103c3c0ec640
---
 .testr.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.testr.conf b/.testr.conf
index 4bc514d6..ea6f49fe 100644
--- a/.testr.conf
+++ b/.testr.conf
@@ -1,7 +1,7 @@
 [DEFAULT]
 test_command=OS_STDOUT_CAPTURE=${OS_STDOUT_CAPTURE:-1} \
              OS_STDERR_CAPTURE=${OS_STDERR_CAPTURE:-1} \
-             OS_TEST_TIMEOUT=${OS_TEST_TIMEOUT:-60} \
+             OS_TEST_TIMEOUT=${OS_TEST_TIMEOUT:-160} \
              ${PYTHON:-python} -m subunit.run discover -t ./ ./nova/tests $LISTOPT $IDOPTION
 
 test_id_option=--load-list $IDFILE