From 7896760cd826307090ee7abf0dcc8307c656be30 Mon Sep 17 00:00:00 2001
From: Steven Hardy <shardy@redhat.com>
Date: Mon, 11 May 2015 10:59:49 +0100
Subject: [PATCH] Work around pypy testing issue

We appear to be hitting an issue similar to bug #1290562, so try the
same workaround.

Change-Id: I17b663480016394daaa0378907c02f965be4222b
Partial-Bug: #1453095
Related-Bug: #1290562
---
 tox.ini | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/tox.ini b/tox.ini
index c0999ceb..caf84b9a 100644
--- a/tox.ini
+++ b/tox.ini
@@ -11,6 +11,11 @@ deps = -r{toxinidir}/requirements.txt
        -r{toxinidir}/test-requirements.txt
 commands = python setup.py testr --slowest --testr-args='{posargs}'
 
+[testenv:pypy]
+deps = setuptools<3.2
+       -r{toxinidir}/requirements.txt
+       -r{toxinidir}/test-requirements.txt
+
 [testenv:pep8]
 commands =
     flake8
@@ -37,4 +42,4 @@ exclude=.venv,.git,.tox,dist,*openstack/common*,*lib/python*,*egg,build
 max-complexity=20
 
 [hacking]
-import_exceptions = heatclient.openstack.common._i18n
\ No newline at end of file
+import_exceptions = heatclient.openstack.common._i18n