Test that concurrent sqlalchemy transactions don't block

Neutron (and presumably other projects) expect to be able to have
overlapping transactions open from two eventlets at once, without
deadlock.

Note that the default mysql sqlalchemy engine (mysqldb) fails this test.

This change modifies py27 tox env to run the full test suite separately
with and without TEST_EVENTLET environment variable set.  When set,
tests are run with eventlet imported and monkey_patched.

Change-Id: Ib35c95defea8ace5b456af28801659f2ba67eb96
Related-Bug: #1350149

1 files changed, 6 insertions, 0 deletions

diff --git a/tox.ini b/tox.ini
index 33e0523..5f791e7 100644
--- a/tox.ini
+++ b/tox.ini
@@ -10,6 +10,7 @@ envlist = py26,py27,py34,pep8,pip-missing-reqs
 # for oslo libraries because of the namespace package.
 #usedevelop = True
 whitelist_externals = bash
+                      env
 install_command = pip install -U {opts} {packages}
 setenv =
    VIRTUAL_ENV={envdir}
@@ -21,6 +22,11 @@ commands = bash tools/pretty_tox.sh '{posargs}'
 commands = pip install SQLAlchemy>=0.9.0,!=0.9.5,<1.0.0
             python setup.py testr --slowest --testr-args='{posargs}'
 
+[testenv:py27]
+commands =
+    env TEST_EVENTLET=0 bash tools/pretty_tox.sh '{posargs}'
+    env TEST_EVENTLET=1 bash tools/pretty_tox.sh '{posargs}'
+
 [testenv:mysql-python]
 setenv =
    {[testenv]setenv}